From aee79da124c56e05c64f337afcd367e1cdc45640 Mon Sep 17 00:00:00 2001 From: Qwerty5Uiop Date: Fri, 22 Sep 2023 13:53:35 +0300 Subject: [PATCH 001/224] 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 Date: Fri, 21 Jul 2023 14:10:46 +0400 Subject: [PATCH 002/224] 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 Date: Mon, 25 Sep 2023 15:13:16 +0300 Subject: [PATCH 003/224] 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 Date: Mon, 25 Sep 2023 21:12:21 +0500 Subject: [PATCH 004/224] Fix empty TransferBatch event handling (#7959) * Fix empty TransferBatch event handling * changelog * format * migration * fixed changelog --------- Co-authored-by: Victor Baranov --- 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 005/224] 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] --- 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 006/224] 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] --- 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 007/224] 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] --- 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 008/224] 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] --- 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 Date: Fri, 22 Sep 2023 14:29:43 +0300 Subject: [PATCH 009/224] 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 Date: Fri, 22 Sep 2023 14:33:11 +0300 Subject: [PATCH 010/224] 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 Date: Tue, 26 Sep 2023 12:26:58 +0300 Subject: [PATCH 011/224] 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 Date: Tue, 26 Sep 2023 13:11:56 +0300 Subject: [PATCH 012/224] 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 Date: Tue, 26 Sep 2023 13:59:13 +0300 Subject: [PATCH 013/224] 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 014/224] 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] --- 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 015/224] 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] --- 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 016/224] 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 017/224] =?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 Date: Wed, 27 Sep 2023 17:17:43 +0300 Subject: [PATCH 018/224] 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 019/224] 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] --- 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 020/224] 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] --- 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 Date: Thu, 28 Sep 2023 11:42:11 +0300 Subject: [PATCH 021/224] 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 @@

BlockScout

    -
  • <%= gettext("Submit an Issue") %>
    • +
  • <%= gettext("Submit an Issue") %>
  • <%= gettext("Contribute") %>
  • <%= gettext("Chat (#blockscout)") %>
    • <%= 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() <> ": " + 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 Date: Thu, 28 Sep 2023 13:01:24 +0300 Subject: [PATCH 022/224] 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 Date: Fri, 29 Sep 2023 12:20:19 +0300 Subject: [PATCH 023/224] 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 Date: Fri, 29 Sep 2023 15:17:37 +0300 Subject: [PATCH 024/224] 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 025/224] 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] --- 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 026/224] 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] --- 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 Date: Thu, 24 Aug 2023 16:08:41 +0300 Subject: [PATCH 027/224] 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 Date: Wed, 27 Sep 2023 12:30:58 +0300 Subject: [PATCH 028/224] 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 029/224] 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] --- 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 Date: Sun, 1 Oct 2023 21:22:23 +0300 Subject: [PATCH 030/224] 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 031/224] 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] --- 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 Date: Sun, 1 Oct 2023 21:47:40 +0300 Subject: [PATCH 032/224] 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 033/224] 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] --- 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 034/224] 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] --- 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 Date: Mon, 2 Oct 2023 10:53:59 +0300 Subject: [PATCH 035/224] 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 Date: Mon, 2 Oct 2023 07:50:55 +0300 Subject: [PATCH 036/224] 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 Date: Mon, 2 Oct 2023 12:49:49 +0300 Subject: [PATCH 037/224] 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 038/224] 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 @@ -

    BlockScout

    +

    Blockscout

    Blockchain Explorer for inspecting and analyzing EVM Chains.

    @@ -8,21 +8,21 @@
    -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 039/224] 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 Date: Mon, 21 Aug 2023 22:20:18 +0300 Subject: [PATCH 040/224] 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 Date: Mon, 2 Oct 2023 15:28:31 +0300 Subject: [PATCH 041/224] 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 042/224] 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] --- 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 Date: Mon, 2 Oct 2023 23:44:52 +0300 Subject: [PATCH 043/224] 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 Date: Tue, 3 Oct 2023 10:30:09 +0300 Subject: [PATCH 044/224] 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 045/224] 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 Date: Wed, 4 Oct 2023 11:54:52 +0300 Subject: [PATCH 046/224] 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 Date: Sun, 17 Sep 2023 14:12:13 +0300 Subject: [PATCH 047/224] 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 048/224] 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] --- 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 049/224] 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] --- 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 050/224] 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] --- 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 051/224] 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] --- 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 052/224] 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 Date: Tue, 10 Oct 2023 23:44:12 +0300 Subject: [PATCH 053/224] 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 Date: Tue, 10 Oct 2023 22:37:42 +0300 Subject: [PATCH 054/224] 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 Date: Fri, 13 Oct 2023 01:42:11 +0200 Subject: [PATCH 055/224] 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 Date: Fri, 13 Oct 2023 17:28:51 +0300 Subject: [PATCH 056/224] 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 Date: Tue, 3 Oct 2023 19:45:35 +0300 Subject: [PATCH 057/224] 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 Date: Fri, 13 Oct 2023 18:22:49 +0300 Subject: [PATCH 058/224] 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 059/224] 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 Date: Mon, 16 Oct 2023 11:51:18 +0300 Subject: [PATCH 060/224] 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 Date: Mon, 16 Oct 2023 12:20:27 +0300 Subject: [PATCH 061/224] 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 Date: Mon, 16 Oct 2023 13:54:51 +0300 Subject: [PATCH 062/224] 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 063/224] 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] --- 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 064/224] 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] --- 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 065/224] 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] --- 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 066/224] 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] --- 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 067/224] 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] --- 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 068/224] 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] --- 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 069/224] 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] --- 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 070/224] 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] --- 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 071/224] 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] --- 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 Date: Tue, 17 Oct 2023 20:20:45 +0300 Subject: [PATCH 072/224] 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 Date: Wed, 18 Oct 2023 10:45:56 +0300 Subject: [PATCH 073/224] 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 Date: Wed, 18 Oct 2023 13:44:52 +0300 Subject: [PATCH 074/224] 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 075/224] 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 076/224] 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 Date: Thu, 19 Oct 2023 13:40:43 +0600 Subject: [PATCH 077/224] 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 Date: Thu, 19 Oct 2023 12:56:39 +0300 Subject: [PATCH 078/224] 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 Date: Wed, 4 Oct 2023 14:00:53 +0300 Subject: [PATCH 079/224] 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 Date: Thu, 19 Oct 2023 14:51:49 +0300 Subject: [PATCH 080/224] 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 Date: Fri, 20 Oct 2023 12:23:44 +0300 Subject: [PATCH 081/224] 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 Date: Fri, 20 Oct 2023 12:36:57 +0300 Subject: [PATCH 082/224] 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 Date: Thu, 19 Oct 2023 17:35:14 +0600 Subject: [PATCH 083/224] 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 Date: Thu, 5 Oct 2023 19:13:34 +0600 Subject: [PATCH 084/224] 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 Date: Mon, 2 Oct 2023 13:07:12 +0300 Subject: [PATCH 085/224] 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 Date: Fri, 20 Oct 2023 16:46:16 +0300 Subject: [PATCH 086/224] 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 + +
    + Dependencies version bumps +
    + +## 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 +
    + Dependencies version bumps +- [#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 +
    + ## 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 Date: Fri, 20 Oct 2023 17:39:05 +0300 Subject: [PATCH 087/224] 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 @@
    Dependencies version bumps -- [#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
    ## 5.2.3-beta From 85b1dacdcd9856bba46a32a636dc4a960e10f1a0 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Fri, 20 Oct 2023 18:41:44 +0300 Subject: [PATCH 088/224] 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 Date: Mon, 23 Oct 2023 12:24:19 +0300 Subject: [PATCH 089/224] 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 Date: Mon, 23 Oct 2023 18:14:19 +0600 Subject: [PATCH 090/224] 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 091/224] 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] --- 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 092/224] 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] --- 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 093/224] 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] --- 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 094/224] 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] --- 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 095/224] 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] --- 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 096/224] 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] --- 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 097/224] 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] --- 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 098/224] 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] --- 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 Date: Tue, 24 Oct 2023 11:43:55 +0300 Subject: [PATCH 099/224] 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 100/224] 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] --- 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 Date: Mon, 23 Oct 2023 21:45:06 +0300 Subject: [PATCH 101/224] 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
    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 102/224] 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] --- 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 Date: Tue, 24 Oct 2023 14:11:21 +0300 Subject: [PATCH 103/224] 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 Date: Mon, 23 Oct 2023 20:23:39 +0300 Subject: [PATCH 104/224] 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 Date: Mon, 23 Oct 2023 20:25:36 +0300 Subject: [PATCH 105/224] 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 106/224] 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 107/224] 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 108/224] 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 109/224] 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 110/224] 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 111/224] 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 112/224] 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 113/224] 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 114/224] 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 115/224] 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 116/224] 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 117/224] 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 118/224] 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 119/224] 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 120/224] 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 121/224] 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 122/224] 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 123/224] 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 124/224] 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 125/224] 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 126/224] 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 127/224] 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 128/224] 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 129/224] 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 130/224] 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 131/224] 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 132/224] 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 133/224] 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 134/224] 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 135/224] 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 136/224] 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 137/224] 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 138/224] 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 139/224] 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 140/224] 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 141/224] 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 142/224] 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 143/224] 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 144/224] 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 145/224] 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 146/224] 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 147/224] 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 148/224] 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 149/224] 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 Date: Thu, 14 Sep 2023 11:59:32 +0300 Subject: [PATCH 150/224] 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 151/224] 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 152/224] 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 153/224] 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 154/224] 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 155/224] 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 156/224] 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 157/224] 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 Date: Tue, 24 Oct 2023 16:24:43 +0600 Subject: [PATCH 158/224] 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 159/224] 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 160/224] 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 161/224] 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 Date: Wed, 25 Oct 2023 15:37:21 +0300 Subject: [PATCH 162/224] 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 163/224] 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 164/224] 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 165/224] 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 166/224] 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 167/224] 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 +
    Dependencies version bumps
    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 168/224] 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 Date: Thu, 26 Oct 2023 18:45:14 +0600 Subject: [PATCH 169/224] 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 Date: Thu, 26 Oct 2023 16:18:07 +0300 Subject: [PATCH 170/224] 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 + +
    + Dependencies version bumps +
    + +## 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 @@
    Dependencies version bumps +- [#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
    ## 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 Date: Thu, 26 Oct 2023 16:26:54 +0300 Subject: [PATCH 171/224] 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 @@
    Dependencies version bumps + - [#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 +
    ## 5.3.0-beta @@ -99,6 +101,7 @@
    Dependencies version bumps + - [#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 +
    ## 5.2.3-beta @@ -173,6 +177,7 @@
    Dependencies version bumps + - [#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 +
    ## 5.2.2-beta From 232b6090d7815b5144131cecf3242cf4f7b3cd98 Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Thu, 26 Oct 2023 16:40:13 +0300 Subject: [PATCH 172/224] 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 Date: Thu, 26 Oct 2023 17:58:57 +0300 Subject: [PATCH 173/224] 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 @@
    Dependencies version bumps -- [#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 Date: Thu, 26 Oct 2023 21:47:24 +0300 Subject: [PATCH 174/224] 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 Date: Fri, 27 Oct 2023 10:02:15 +0300 Subject: [PATCH 175/224] 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 Date: Fri, 27 Oct 2023 10:06:56 +0300 Subject: [PATCH 176/224] 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 Date: Fri, 27 Oct 2023 18:26:02 +0300 Subject: [PATCH 177/224] 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 +
    Dependencies version bumps
    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 178/224] 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 179/224] 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] --- 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 Date: Mon, 30 Oct 2023 15:42:19 +0300 Subject: [PATCH 180/224] 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 181/224] 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] --- 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 182/224] 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] --- 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 183/224] 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] --- 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 184/224] 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] --- 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 185/224] 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] --- 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 186/224] 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] --- 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 187/224] 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] --- 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 Date: Mon, 30 Oct 2023 23:30:28 +0300 Subject: [PATCH 188/224] 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 Date: Tue, 31 Oct 2023 12:32:17 +0600 Subject: [PATCH 189/224] 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 Date: Tue, 31 Oct 2023 10:13:15 +0300 Subject: [PATCH 190/224] 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 Date: Tue, 31 Oct 2023 12:16:23 +0300 Subject: [PATCH 191/224] 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 Date: Wed, 1 Nov 2023 12:31:41 +0300 Subject: [PATCH 192/224] 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 Date: Tue, 7 Nov 2023 17:01:17 +0600 Subject: [PATCH 193/224] 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 194/224] 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 --- .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 195/224] 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] --- 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 196/224] 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] --- 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 197/224] 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] --- 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 198/224] 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] --- 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 199/224] 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] --- 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 Date: Wed, 1 Nov 2023 18:24:09 +0300 Subject: [PATCH 200/224] 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 201/224] =?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 202/224] 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 203/224] 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 --- 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 204/224] 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
    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 205/224] 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 206/224] 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 207/224] 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
    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 Date: Thu, 9 Nov 2023 21:11:40 +0300 Subject: [PATCH 208/224] 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 209/224] 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 210/224] 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 211/224] 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 Date: Thu, 28 Sep 2023 12:34:25 +0300 Subject: [PATCH 212/224] 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 213/224] 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] --- 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 214/224] 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] --- 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 215/224] 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] --- 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 216/224] 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] --- 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 217/224] 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] --- 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 218/224] 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] --- 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 Date: Mon, 13 Nov 2023 13:31:16 +0300 Subject: [PATCH 219/224] 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 Date: Mon, 13 Nov 2023 13:33:30 +0300 Subject: [PATCH 220/224] 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 Date: Tue, 14 Nov 2023 11:26:39 +0300 Subject: [PATCH 221/224] 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 Date: Tue, 14 Nov 2023 14:28:04 +0300 Subject: [PATCH 222/224] 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 Date: Tue, 14 Nov 2023 22:17:38 +0600 Subject: [PATCH 223/224] 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 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 224/224] 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)