diff --git a/CHANGELOG.md b/CHANGELOG.md index 289f674be3..3d4e6f755f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ ## Current + +### Features + +- [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint + +### Fixes +- [#2299](https://github.com/poanetwork/blockscout/pull/2299) - fix interpolation in error message +- [#2303](https://github.com/poanetwork/blockscout/pull/2303) - fix transaction csv download link +- [#2304](https://github.com/poanetwork/blockscout/pull/2304) - footer grid fix for md resolution +- [#2291](https://github.com/poanetwork/blockscout/pull/2291) - dashboard fix for md resolution, transactions load fix, block info row fix, addresses page issue, check mark issue + +### Chore +- [#2302](https://github.com/poanetwork/blockscout/pull/2302) - fix names for xDai source +- [#2289](https://github.com/poanetwork/blockscout/pull/2289) - Optional websockets for dev environment + + +## 2.0.1-beta + ### Features +- [#2283](https://github.com/poanetwork/blockscout/pull/2283) - Add transactions cache - [#2182](https://github.com/poanetwork/blockscout/pull/2182) - add market history cache - [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch - [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache @@ -13,6 +32,8 @@ - [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation ### Fixes +- [#2290](https://github.com/poanetwork/blockscout/pull/2290) - Add eth_get_balance.json to AddressView's render +- [#2286](https://github.com/poanetwork/blockscout/pull/2286) - banner stats issues on sm resolutions, transactions title issue - [#2284](https://github.com/poanetwork/blockscout/pull/2284) - add 404 status for not existing pages - [#2244](https://github.com/poanetwork/blockscout/pull/2244) - fix internal transactions failing to be indexed because of constraint - [#2281](https://github.com/poanetwork/blockscout/pull/2281) - typo issues, dropdown issues @@ -60,6 +81,8 @@ - [#2173](https://github.com/poanetwork/blockscout/pull/2173) - handle correctly empty transactions - [#2174](https://github.com/poanetwork/blockscout/pull/2174) - fix reward channel joining - [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test +- [#2196](https://github.com/poanetwork/blockscout/pull/2196) - Nethermind client fixes +- [#2237](https://github.com/poanetwork/blockscout/pull/2237) - fix rsk total_supply - [#2198](https://github.com/poanetwork/blockscout/pull/2198) - reduce transaction status and error constraint - [#2167](https://github.com/poanetwork/blockscout/pull/2167) - feat: document eth rpc api mimicking endpoints - [#2225](https://github.com/poanetwork/blockscout/pull/2225) - fix metadata decoding in Solidity 0.5.9 smart contract verification @@ -78,8 +101,6 @@ - [#2118](https://github.com/poanetwork/blockscout/pull/2118) - show only the last decompiled contract - [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver -### Chore - ## 2.0.0-beta ### Features diff --git a/apps/block_scout_web/assets/css/components/_card.scss b/apps/block_scout_web/assets/css/components/_card.scss index 6e50100f0d..0737e1b355 100644 --- a/apps/block_scout_web/assets/css/components/_card.scss +++ b/apps/block_scout_web/assets/css/components/_card.scss @@ -6,7 +6,7 @@ $card-vertical-padding: 30px; $card-background-1: $primary !default; $card-background-1-text-color: #fff !default; $card-tab-icon-color: #20b760 !default; -$card-tab-icon-color-active: #20b760 !default; +$card-tab-icon-color-active: #fff !default; .card { background-color: $card-background-color; @@ -14,6 +14,21 @@ $card-tab-icon-color-active: #20b760 !default; border: none; box-shadow: 0 0 30px 0 rgba(202, 199, 226, 0.5); margin-bottom: $common-container-margin; + + .block-details-row { + flex-direction: row; + @include media-breakpoint-down(sm) { + flex-direction: column; + } + + .block-detail-el { + & + .block-detail-el { + @include media-breakpoint-down(sm) { + margin-top: 6px; + } + } + } + } } .card-background-1 { @@ -42,6 +57,12 @@ $card-tab-icon-color-active: #20b760 !default; line-height: 1.2rem; margin-bottom: 2rem; + &.lg-card-title { + @media (max-width: 374px) { + font-size: 13px; + } + } + &.margin-bottom-md { margin-bottom: 25px; } diff --git a/apps/block_scout_web/assets/css/components/_dashboard-banner.scss b/apps/block_scout_web/assets/css/components/_dashboard-banner.scss index ade21afea5..33d104a9fd 100644 --- a/apps/block_scout_web/assets/css/components/_dashboard-banner.scss +++ b/apps/block_scout_web/assets/css/components/_dashboard-banner.scss @@ -80,6 +80,12 @@ $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !defa flex-direction: row; } + @media (max-width: 599px) { + padding-top: 0; + padding-bottom: 0; + flex-direction: column; + } + &::before { border-radius: 2px; content: ""; @@ -107,6 +113,11 @@ $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !defa line-height: 1.2; margin: 0 0 5px; + @media (max-width: 374px) { + position: relative; + top: -2px; + } + @include media-breakpoint-down(md) { margin: 0 5px 0 0; } @@ -135,12 +146,16 @@ $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !defa width: 750px; position: relative; + @include media-breakpoint-down(lg) { + margin-top: 15px; + width: 550px; + } + @include media-breakpoint-down(md) { border-top-right-radius: 10px; height: auto; justify-content: flex-start; margin-left: 0; - margin-top: 15px; max-width: 100%; padding: 20px 0 20px 20px; width: 250px; @@ -175,6 +190,11 @@ $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !defa display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; + @include media-breakpoint-down(lg) { + grid-template-columns: 1fr 1fr; + row-gap: 20px; + } + @include media-breakpoint-down(md) { grid-template-columns: 1fr; row-gap: 20px; @@ -186,4 +206,17 @@ $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !defa } @include stats-item($dashboard-stats-item-border-color, $dashboard-stats-item-label-color, $dashboard-stats-item-value-color); + + .dashboard-banner-network-stats-item { + @media (max-width: 374px) { + padding-left: calc(0.6rem + 4px); + padding-right: 0.5rem; + } + } + + .dashboard-banner-network-stats-value { + @media (max-width: 374px) { + font-size: 0.9rem; + } + } } \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_stakes_table.scss b/apps/block_scout_web/assets/css/components/_stakes_table.scss index 0bbf59e69c..79cdc20b38 100644 --- a/apps/block_scout_web/assets/css/components/_stakes_table.scss +++ b/apps/block_scout_web/assets/css/components/_stakes_table.scss @@ -7,6 +7,25 @@ $stakes-table-cell-separation: 25px !default; width: 100%; } +.addresses-table-container { + margin-left: -30px; + margin-right: -30px; + .stakes-table-container { + table { + width: 100%; + th:first-child { + padding-left: 25px; + } + td:first-child { + padding-left: 25px; + } + } + } + .color-lighten { + color: #828ba0; + } +} + .stakes-table { min-width: fit-content; width: 100%; diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss index 68b873334c..8965715727 100644 --- a/apps/block_scout_web/assets/css/components/_tile.scss +++ b/apps/block_scout_web/assets/css/components/_tile.scss @@ -272,6 +272,7 @@ $tile-body-a-color: #5959d8 !default; } &.tile-type-block { + max-width: 100%; .tile-title { font-weight: 700; line-height: 1.2; @@ -330,3 +331,23 @@ $tile-body-a-color: #5959d8 !default; } } } + +.card-chain-blocks { + .card-body { + .col-lg-3 { + @include media-breakpoint-down(lg) { + padding-left: 6px; + padding-right: 6px; + } + .tile-type-block { + overflow: hidden; + } + } + .row { + @include media-breakpoint-down(lg) { + margin-left: -6px; + margin-right: -6px; + } + } + } +} diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js index 00f92523ec..f4cd0e6628 100644 --- a/apps/block_scout_web/assets/js/pages/chain.js +++ b/apps/block_scout_web/assets/js/pages/chain.js @@ -142,7 +142,7 @@ const elements = { chart = createMarketHistoryChart($el[0]) }, render ($el, state, oldState) { - if (!chart || (oldState.availableSupply === state.availableSupply && oldState.marketHistoryData === state.marketHistoryData)) return + if (!chart || (oldState.availableSupply === state.availableSupply && oldState.marketHistoryData === state.marketHistoryData) || !state.availableSupply) return chart.update(state.availableSupply, state.marketHistoryData) } }, diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex new file mode 100644 index 0000000000..957dc797be --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/health_controller.ex @@ -0,0 +1,49 @@ +defmodule BlockScoutWeb.API.V1.HealthController do + use BlockScoutWeb, :controller + + alias Explorer.Chain + + def health(conn, _) do + with {:ok, number, timestamp} <- Chain.last_block_status() do + send_resp(conn, :ok, result(number, timestamp)) + else + status -> send_resp(conn, :internal_server_error, error(status)) + end + end + + def result(number, timestamp) do + %{ + "healthy" => true, + "data" => %{ + "latest_block_number" => to_string(number), + "latest_block_inserted_at" => to_string(timestamp) + } + } + |> Jason.encode!() + end + + def error({:error, :no_blocks}) do + %{ + "healthy" => false, + "error_code" => 5002, + "error_title" => "no blocks in db", + "error_description" => "There are no blocks in the DB" + } + |> Jason.encode!() + end + + def error({:error, number, timestamp}) do + %{ + "healthy" => false, + "error_code" => 5001, + "error_title" => "blocks fetching is stuck", + "error_description" => + "There are no new blocks in the DB for the last 5 mins. Check the healthiness of Ethereum archive node or the Blockscout DB instance", + "data" => %{ + "latest_block_number" => to_string(number), + "latest_block_inserted_at" => to_string(timestamp) + } + } + |> Jason.encode!() + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex index 4f66597bcb..b001093c6e 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/recent_transactions_controller.ex @@ -12,7 +12,7 @@ defmodule BlockScoutWeb.RecentTransactionsController do necessity_by_association: %{ :block => :required, [created_contract_address: :names] => :optional, - [from_address: :names] => :required, + [from_address: :names] => :optional, [to_address: :names] => :optional }, paging_options: %PagingOptions{page_size: 5} diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index 2b577722be..e01d121eb8 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -23,6 +23,8 @@ defmodule BlockScoutWeb.Router do get("/supply", SupplyController, :supply) + get("/health", HealthController, :health) + resources("/decompiled_smart_contract", DecompiledSmartContractController, only: [:create]) resources("/verified_smart_contracts", VerifiedSmartContractController, only: [:create]) end diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex index c2e62e2004..9680faa2a8 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex @@ -1,51 +1,39 @@ -
-
- -
+ + - + <%= @index %> -
- -
-
-
- <%= @address |> BlockScoutWeb.AddressView.address_partial_selector(nil, nil) |> BlockScoutWeb.RenderHelpers.render_partial() %> - - - - <%= @tx_count %> - <%= gettext "Transactions sent" %> - <% if validator?(@address) do %> - - <%= @validation_count %> - <%= gettext "Validations" %> - <% end %> - -
- - -
- - <%= balance(@address) %> -
- - - data-usd-exchange-rate="<%= @exchange_rate.usd_value %>"> - <% end %> - - - - <%= if @total_supply do %> - (<%= balance_percentage(@address, @total_supply) %>) - <% end %> - -
-
-
-
-
-
+ + + <%= @address |> BlockScoutWeb.AddressView.address_partial_selector(nil, nil) |> BlockScoutWeb.RenderHelpers.render_partial() %> + + + <%= balance(@address) %> + + + data-usd-exchange-rate="<%= @exchange_rate.usd_value %>"> + <% end %> + + + + + <%= if @total_supply do %> + (<%= balance_percentage(@address, @total_supply) %>) + <% end %> + + + + + <%= @tx_count %> + <%= gettext "Transactions sent" %> + <% if validator?(@address) do %> + + <%= @validation_count %> + <%= gettext "Validations" %> + <% end %> + + + diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex index 47d7f2457b..3aaab46ad5 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex @@ -3,11 +3,48 @@

<%= gettext "Addresses" %>

- <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %> - -
- - <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %> + <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %> + +
+
+ + + + + + + + + + + + + +
+
+   +
+ 		+
+ Address +
+ 		+
+ Balance +
+ 		+
+ Percentage +
+ 		+
+ Txn Count +
+
+
+
+ + <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex index 76387a9662..e6178a4e72 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex @@ -4,7 +4,7 @@
-

+

<%= address_title(@address) %> <%= gettext "Details" %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex index 5abd8285c6..c3a4c94129 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex @@ -66,10 +66,10 @@

- +
- Download to_string(@address.hash)}) %>><%= gettext("CSV") %> + Download to_string(@address.hash)}) %>><%= gettext("CSV") %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex index 23985be4f6..24b2d9e61a 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex @@ -16,17 +16,17 @@ <%= link(@block, to: block_path(BlockScoutWeb.Endpoint, :show, @block.number)) %> <% end %> -
+
- <%= gettext "%{count} Transactions", count: @block_transaction_count %> + <%= gettext "%{count} Transactions", count: @block_transaction_count %> <%= if @block.size do %> - <%= Cldr.Unit.new(:byte, @block.size) |> cldr_unit_to_string!() %> + <%= Cldr.Unit.new(:byte, @block.size) |> cldr_unit_to_string!() %> <% end %> - +
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex index 17bd9c4afe..0c29001697 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex @@ -105,7 +105,7 @@
<%= link(gettext("View All Transactions"), to: transaction_path(BlockScoutWeb.Endpoint, :index), class: "btn-line float-right") %> -

<%= gettext "Transactions" %>

+

<%= gettext "Transactions" %>

<%= gettext "More transactions have come in" %> 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 7188f283a1..9d84836a5a 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 @@ -13,7 +13,7 @@ <% col_size = if Enum.empty?(other_explorers), do: 3, else: 2 %>
-
+

<%= gettext("Blockscout is a tool for inspecting and analyzing EVM based blockchains. Blockchain explorer for Ethereum Networks.") %>

@@ -28,7 +28,7 @@
-
+

BlockScout

  • <%= gettext("Submit an Issue") %>
    • @@ -40,7 +40,7 @@ <% main_nets = main_nets(other_networks()) %> <%= unless Enum.empty?(main_nets) do %> -
    +

    <%= gettext("Main Networks") %>

      <%= for %{title: title, url: url} <- main_nets do %> @@ -53,7 +53,7 @@ <% test_nets = test_nets(other_networks()) %> <%= unless Enum.empty?(test_nets) do %> -
      +

      <%= gettext("Test Networks") %>

        <%= for %{title: title, url: url} <- test_nets do %> @@ -64,7 +64,7 @@ <% end %> <%= unless Enum.empty?(other_explorers) do %> -
        +

        <%= gettext("Other Explorers") %>

          <%= for {name, url} <- other_explorers do %> diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex index 248dc942c7..01f54dd46d 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex @@ -51,6 +51,10 @@ defmodule BlockScoutWeb.API.RPC.AddressView do RPCView.render("show.json", data: data) end + def render("eth_get_balance.json", %{balance: balance}) do + EthRPCView.render("show.json", %{result: balance, id: 0}) + end + def render("eth_get_balance_error.json", %{error: message}) do EthRPCView.render("error.json", %{error: message, id: 0}) end diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index b0fd95a641..ed6f3c655f 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -877,7 +877,7 @@ msgid "Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/_tile.html.eex:19 +#: lib/block_scout_web/templates/address/_tile.html.eex:31 msgid "Transactions sent" msgstr "" @@ -923,7 +923,7 @@ msgid "Validated Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/_tile.html.eex:23 +#: lib/block_scout_web/templates/address/_tile.html.eex:35 msgid "Validations" msgstr "" diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs new file mode 100644 index 0000000000..41735f685a --- /dev/null +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs @@ -0,0 +1,50 @@ +defmodule BlockScoutWeb.API.V1.HealthControllerTest do + use BlockScoutWeb.ConnCase + + describe "GET last_block_status/0" do + test "returns error when there are no blocks in db", %{conn: conn} do + request = get(conn, api_v1_health_path(conn, :health)) + + assert request.status == 500 + + assert request.resp_body == + "{\"error_code\":5002,\"error_description\":\"There are no blocks in the DB\",\"error_title\":\"no blocks in db\",\"healthy\":false}" + end + + test "returns error when last block is stale", %{conn: conn} do + insert(:block, consensus: true, timestamp: Timex.shift(DateTime.utc_now(), hours: -50)) + + request = get(conn, api_v1_health_path(conn, :health)) + + assert request.status == 500 + + assert %{ + "healthy" => false, + "error_code" => 5001, + "error_title" => "blocks fetching is stuck", + "error_description" => + "There are no new blocks in the DB for the last 5 mins. Check the healthiness of Ethereum archive node or the Blockscout DB instance", + "data" => %{ + "latest_block_number" => _, + "latest_block_inserted_at" => _ + } + } = Poison.decode!(request.resp_body) + end + + test "returns ok when last block is not stale", %{conn: conn} do + insert(:block, consensus: true, timestamp: DateTime.utc_now()) + + request = get(conn, api_v1_health_path(conn, :health)) + + assert request.status == 200 + + assert %{ + "healthy" => true, + "data" => %{ + "latest_block_number" => _, + "latest_block_inserted_at" => _ + } + } = Poison.decode!(request.resp_body) + end + end +end diff --git a/apps/block_scout_web/test/support/conn_case.ex b/apps/block_scout_web/test/support/conn_case.ex index 6c3f24d89a..d0b9b066a1 100644 --- a/apps/block_scout_web/test/support/conn_case.ex +++ b/apps/block_scout_web/test/support/conn_case.ex @@ -38,6 +38,9 @@ defmodule BlockScoutWeb.ConnCase do Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()}) end + Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) + Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) + {:ok, conn: Phoenix.ConnTest.build_conn()} end end diff --git a/apps/block_scout_web/test/support/feature_case.ex b/apps/block_scout_web/test/support/feature_case.ex index cf9d64cdc5..b9e6f000d7 100644 --- a/apps/block_scout_web/test/support/feature_case.ex +++ b/apps/block_scout_web/test/support/feature_case.ex @@ -27,6 +27,9 @@ defmodule BlockScoutWeb.FeatureCase do Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()}) end + Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) + Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) + metadata = Phoenix.Ecto.SQL.Sandbox.metadata_for(Explorer.Repo, self()) {:ok, session} = Wallaby.start_session(metadata: metadata) session = Wallaby.Browser.resize_window(session, 1200, 800) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index 71994da56c..3e1188eef9 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -358,7 +358,9 @@ defmodule EthereumJSONRPC do String.to_integer(hexadecimal_digits, 16) end - def quantity_to_integer(string) do + def quantity_to_integer(integer) when is_integer(integer), do: integer + + def quantity_to_integer(string) when is_binary(string) do case Integer.parse(string) do {integer, ""} -> integer _ -> :error diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex index ded7304364..6d9f946554 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex @@ -7,6 +7,8 @@ defmodule EthereumJSONRPC.HTTP do require Logger + import EthereumJSONRPC, only: [quantity_to_integer: 1] + @behaviour Transport @doc """ @@ -131,12 +133,17 @@ defmodule EthereumJSONRPC.HTTP do # restrict response to only those fields supported by the JSON-RPC 2.0 standard, which means that level of keys is # validated, so we can indicate that with switch to atom keys. defp standardize_response(%{"jsonrpc" => "2.0" = jsonrpc, "id" => id} = unstandardized) do + # Nethermind return string ids + id = quantity_to_integer(id) + standardized = %{jsonrpc: jsonrpc, id: id} case unstandardized do %{"result" => _, "error" => _} -> raise ArgumentError, - "result and error keys are mutually exclusive in JSONRPC 2.0 response objects, but got #{unstandardized}" + "result and error keys are mutually exclusive in JSONRPC 2.0 response objects, but got #{ + inspect(unstandardized) + }" %{"result" => result} -> Map.put(standardized, :result, result) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex index 7bc96509b4..cf1a74954a 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex @@ -294,6 +294,11 @@ defmodule EthereumJSONRPC.Receipt do :ignore end + # Nethermind field + defp entry_to_elixir({"error", _}) do + :ignore + end + defp entry_to_elixir({key, value}) do {:error, {:unknown_key, %{key: key, value: value}}} end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex index d59c1fb349..f021bfa153 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex @@ -322,6 +322,10 @@ defmodule EthereumJSONRPC.Transaction do when key in ~w(blockHash condition creates from hash input jsonrpc publicKey raw to txType), do: {key, value} + # specific to Nethermind client + defp entry_to_elixir({"data", value}), + do: {"input", value} + defp entry_to_elixir({key, quantity}) when key in ~w(gas gasPrice nonce r s standardV v value) and quantity != nil do {key, quantity_to_integer(quantity)} end diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index d834d23384..10012bbc67 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -14,7 +14,8 @@ config :explorer, System.get_env("ALLOWED_EVM_VERSIONS") || "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg", include_uncles_in_average_block_time: - if(System.get_env("UNCLES_IN_AVERAGE_BLOCK_TIME") == "false", do: false, else: true) + if(System.get_env("UNCLES_IN_AVERAGE_BLOCK_TIME") == "false", do: false, else: true), + healthy_blocks_period: System.get_env("HEALTHY_BLOCKS_PERIOD") || :timer.minutes(5) config :explorer, Explorer.Counters.AverageBlockTime, enabled: true @@ -84,8 +85,8 @@ case System.get_env("SUPPLY_MODULE") do :ok end -if System.get_env("SOURCE_MODULE") == "TransactionAndLog" do - config :explorer, Explorer.ExchangeRates.Source, source: Explorer.ExchangeRates.Source.TransactionAndLog +if System.get_env("SOURCE_MODULE") == "TokenBridge" do + config :explorer, Explorer.ExchangeRates.Source, source: Explorer.ExchangeRates.Source.TokenBridge end config :explorer, diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex index 724e4f41a1..5a6aa1795b 100644 --- a/apps/explorer/lib/explorer/application.ex +++ b/apps/explorer/lib/explorer/application.ex @@ -6,7 +6,18 @@ defmodule Explorer.Application do use Application alias Explorer.Admin - alias Explorer.Chain.{BlockCountCache, BlockNumberCache, BlocksCache, NetVersionCache, TransactionCountCache} + + alias Explorer.Chain.{ + BlockCountCache, + BlockNumberCache, + BlocksCache, + NetVersionCache, + TransactionCountCache, + TransactionsCache + } + + alias Explorer.Chain.Supply.RSK + alias Explorer.Market.MarketHistoryCache alias Explorer.Repo.PrometheusLogger @@ -34,7 +45,9 @@ defmodule Explorer.Application do {BlockCountCache, []}, con_cache_child_spec(BlocksCache.cache_name()), con_cache_child_spec(NetVersionCache.cache_name()), - con_cache_child_spec(MarketHistoryCache.cache_name()) + 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)), + con_cache_child_spec(TransactionsCache.cache_name()) ] children = base_children ++ configurable_children() @@ -83,14 +96,13 @@ defmodule Explorer.Application do ] end - defp con_cache_child_spec(name) do + defp con_cache_child_spec(name, params \\ [ttl_check_interval: false]) do + params = Keyword.put(params, :name, name) + Supervisor.child_spec( { ConCache, - [ - name: name, - ttl_check_interval: false - ] + params }, id: {ConCache, name} ) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index c6fe89ab49..fcad694a58 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -46,6 +46,7 @@ defmodule Explorer.Chain do TokenTransfer, Transaction, TransactionCountCache, + TransactionsCache, Wei } @@ -1768,6 +1769,31 @@ defmodule Explorer.Chain do Repo.one!(query) end + def last_block_status do + query = + from(block in Block, + select: {block.number, block.timestamp}, + where: block.consensus == true, + order_by: [desc: block.number], + limit: 1 + ) + + case Repo.one(query) do + nil -> + {:error, :no_blocks} + + {number, timestamp} -> + now = DateTime.utc_now() + last_block_period = DateTime.diff(now, timestamp, :millisecond) + + if last_block_period > Application.get_env(:explorer, :healthy_blocks_period) do + {:error, number, timestamp} + else + {:ok, number, timestamp} + end + end + end + @doc """ Calculates the ranges of missing consensus blocks in `range`. @@ -1948,9 +1974,27 @@ defmodule Explorer.Chain do @spec recent_collated_transactions([paging_options | necessity_by_association_option]) :: [Transaction.t()] def recent_collated_transactions(options \\ []) when is_list(options) do necessity_by_association = Keyword.get(options, :necessity_by_association, %{}) + paging_options = Keyword.get(options, :paging_options, @default_paging_options) - options - |> Keyword.get(:paging_options, @default_paging_options) + if is_nil(paging_options.key) do + paging_options.page_size + |> TransactionsCache.take_enough() + |> case do + nil -> + transactions = fetch_recent_collated_transactions(paging_options, necessity_by_association) + TransactionsCache.update(transactions) + transactions + + transactions -> + transactions + end + else + fetch_recent_collated_transactions(paging_options, necessity_by_association) + end + end + + def fetch_recent_collated_transactions(paging_options, necessity_by_association) do + paging_options |> fetch_transactions() |> where([transaction], not is_nil(transaction.block_number) and not is_nil(transaction.index)) |> join_associations(necessity_by_association) diff --git a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex index 1a9fcc497d..2c36d7c7e5 100644 --- a/apps/explorer/lib/explorer/chain/import/runner/transactions.ex +++ b/apps/explorer/lib/explorer/chain/import/runner/transactions.ex @@ -90,8 +90,7 @@ defmodule Explorer.Chain.Import.Runner.Transactions do conflict_target: :hash, on_conflict: on_conflict, for: Transaction, - returning: - ~w(block_number index hash internal_transactions_indexed_at block_hash old_block_hash nonce from_address_hash created_contract_address_hash)a, + returning: true, timeout: timeout, timestamps: timestamps ) diff --git a/apps/explorer/lib/explorer/chain/supply/rsk.ex b/apps/explorer/lib/explorer/chain/supply/rsk.ex index 09a02252a2..bc4171e45f 100644 --- a/apps/explorer/lib/explorer/chain/supply/rsk.ex +++ b/apps/explorer/lib/explorer/chain/supply/rsk.ex @@ -6,14 +6,20 @@ defmodule Explorer.Chain.Supply.RSK do use Explorer.Chain.Supply import Ecto.Query, only: [from: 2] + import EthereumJSONRPC, only: [integer_to_quantity: 1] + alias EthereumJSONRPC.FetchedBalances alias Explorer.Chain.Address.CoinBalance - alias Explorer.Chain.{Block, Wei} - alias Explorer.ExchangeRates.Token - alias Explorer.{Market, Repo} + alias Explorer.Chain.{Block, BlockNumberCache, Wei} + alias Explorer.Repo + + @cache_name :rsk_balance + @balance_key :balance def market_cap(exchange_rate) do - circulating() * exchange_rate.usd_value + btc = circulating() + + Decimal.mult(btc, exchange_rate.usd_value) end @doc "Equivalent to getting the circulating value " @@ -60,13 +66,16 @@ defmodule Explorer.Chain.Supply.RSK do |> Timex.shift(days: i) |> Timex.to_date() - case Map.get(by_day, date) do - nil -> - {Map.put(days, date, last), last} + cur_value = + case Map.get(by_day, date) do + nil -> + last + + value -> + value.value + end - value -> - {Map.put(days, date, value.value), value.value} - end + {Map.put(days, date, calculate_value(cur_value)), cur_value} end) |> elem(0) @@ -74,18 +83,48 @@ defmodule Explorer.Chain.Supply.RSK do end def circulating do - query = - from(balance in CoinBalance, - join: block in Block, - on: block.number == balance.block_number, - where: block.consensus == true, - where: balance.address_hash == ^"0x0000000000000000000000000000000001000006", - order_by: [desc: block.timestamp], - limit: 1, - select: balance.value - ) + value = ConCache.get(@cache_name, @balance_key) + + if is_nil(value) do + updated_value = fetch_circulating_value() - Repo.one(query) || wei!(0) + ConCache.put(@cache_name, @balance_key, updated_value) + + updated_value + else + value + end + end + + def cache_name, do: @cache_name + + defp fetch_circulating_value do + max_number = BlockNumberCache.max_number() + + params = [ + %{block_quantity: integer_to_quantity(max_number), hash_data: "0x0000000000000000000000000000000001000006"} + ] + + json_rpc_named_argumens = Application.get_env(:explorer, :json_rpc_named_arguments) + + case EthereumJSONRPC.fetch_balances(params, json_rpc_named_argumens) do + {:ok, + %FetchedBalances{ + errors: [], + params_list: [ + %{ + address_hash: "0x0000000000000000000000000000000001000006", + value: value + } + ] + }} -> + calculate_value(value) + + _ -> + Decimal.new(0) + end + rescue + _ -> Decimal.new(0) end defp wei!(value) do @@ -94,10 +133,15 @@ defmodule Explorer.Chain.Supply.RSK do end def total do - 21_000_000 + Decimal.new(21_000_000) end - def exchange_rate do - Market.get_exchange_rate(Explorer.coin()) || Token.null() + defp calculate_value(val) do + sub = + val + |> Decimal.new() + |> Decimal.div(Decimal.new(1_000_000_000_000_000_000)) + + Decimal.sub(total(), sub) end end diff --git a/apps/explorer/lib/explorer/chain/supply/transaction_and_log.ex b/apps/explorer/lib/explorer/chain/supply/transaction_and_log.ex deleted file mode 100644 index 36432094fa..0000000000 --- a/apps/explorer/lib/explorer/chain/supply/transaction_and_log.ex +++ /dev/null @@ -1,78 +0,0 @@ -defmodule Explorer.Chain.Supply.TransactionAndLog do - @moduledoc """ - Defines the supply API for calculating the supply for smaller chains with - specific mint and burn events - """ - use Explorer.Chain.Supply - - alias Explorer.Chain.{InternalTransaction, Log, Wei} - alias Explorer.{Chain, Repo} - - {:ok, base_wei} = Wei.cast(0) - @base_wei base_wei - - {:ok, burn_address} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000") - - @burn_address burn_address - @bridge_edge "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a" - - import Ecto.Query, only: [from: 2] - - def circulating, do: total(Timex.now()) - - def total, do: total(Timex.now()) - - @doc false - @spec total(DateTime.t()) :: %Decimal{sign: 1} - def total(on_date) do - on_date - |> minted_value - |> Wei.sub(burned_value(on_date)) - |> Wei.to(:ether) - end - - def supply_for_days(days_count) when is_integer(days_count) and days_count > 0 do - past_days = -(days_count - 1) - - result = - for i <- past_days..0, into: %{} do - datetime = Timex.shift(Timex.now(), days: i) - {DateTime.to_date(datetime), total(datetime)} - end - - {:ok, result} - end - - defp minted_value(on_date) do - query = - from( - l in Log, - join: t in assoc(l, :transaction), - join: b in assoc(t, :block), - where: b.timestamp <= ^on_date and l.first_topic == @bridge_edge, - select: fragment("concat('0x', encode(?, 'hex'))", l.data) - ) - - query - |> Repo.all() - |> Enum.reduce(@base_wei, fn data, acc -> - {:ok, wei_value} = Wei.cast(data) - Wei.sum(wei_value, acc) - end) - end - - defp burned_value(on_date) do - query = - from( - it in InternalTransaction, - join: t in assoc(it, :transaction), - join: b in assoc(t, :block), - where: b.timestamp <= ^on_date and it.to_address_hash == ^@burn_address, - select: it.value - ) - - query - |> Repo.all() - |> Enum.reduce(@base_wei, fn data, acc -> Wei.sum(data, acc) end) - end -end diff --git a/apps/explorer/lib/explorer/chain/transactions_cache.ex b/apps/explorer/lib/explorer/chain/transactions_cache.ex new file mode 100644 index 0000000000..3859561295 --- /dev/null +++ b/apps/explorer/lib/explorer/chain/transactions_cache.ex @@ -0,0 +1,143 @@ +defmodule Explorer.Chain.TransactionsCache do + @moduledoc """ + Caches the latest imported transactions + """ + + alias Explorer.Chain.Transaction + alias Explorer.Repo + + @transactions_ids_key "transactions_ids" + @cache_name :transactions + @max_size 51 + @preloads [ + :block, + created_contract_address: :names, + from_address: :names, + to_address: :names, + token_transfers: :token, + token_transfers: :from_address, + token_transfers: :to_address + ] + + @spec cache_name :: atom() + def cache_name, do: @cache_name + + @doc """ + Fetches a transaction from its id ({block_number, index}), returns nil if not found + """ + @spec get({non_neg_integer(), non_neg_integer()}) :: Transaction.t() | nil + def get(id), do: ConCache.get(@cache_name, id) + + @doc """ + Return the current number of transactions stored + """ + @spec size :: non_neg_integer() + def size, do: Enum.count(transactions_ids()) + + @doc """ + Checks if there are enough transactions stored + """ + @spec enough?(non_neg_integer()) :: boolean() + def enough?(amount) do + amount <= size() + end + + @doc """ + Checks if the number of transactions stored is already the max allowed + """ + @spec full? :: boolean() + def full? do + @max_size <= size() + end + + @doc "Returns the list ids of the transactions currently stored" + @spec transactions_ids :: [{non_neg_integer(), non_neg_integer()}] + def transactions_ids do + ConCache.get(@cache_name, @transactions_ids_key) || [] + end + + @doc "Returns all the stored transactions" + @spec all :: [Transaction.t()] + def all, do: Enum.map(transactions_ids(), &get(&1)) + + @doc "Returns the `n` most recent transactions stored" + @spec take(integer()) :: [Transaction.t()] + def take(amount) do + transactions_ids() + |> Enum.take(amount) + |> Enum.map(&get(&1)) + end + + @doc """ + Returns the `n` most recent transactions, unless there are not as many stored, + in which case returns `nil` + """ + @spec take_enough(integer()) :: [Transaction.t()] | nil + def take_enough(amount) do + if enough?(amount), do: take(amount) + end + + @doc """ + Adds a transaction (or a list of transactions). + If the cache is already full, the transaction will be only stored if it can take + the place of a less recent one. + NOTE: each transaction is inserted atomically + """ + @spec update([Transaction.t()] | Transaction.t() | nil) :: :ok + def update(transactions) when is_nil(transactions), do: :ok + + def update(transactions) when is_list(transactions) do + Enum.map(transactions, &update(&1)) + end + + def update(transaction) do + ConCache.isolated(@cache_name, @transactions_ids_key, fn -> + transaction_id = {transaction.block_number, transaction.index} + ids = transactions_ids() + + if full?() do + {init, [min]} = Enum.split(ids, -1) + + cond do + transaction_id < min -> + :ok + + transaction_id > min -> + insert_transaction(transaction_id, transaction, init) + ConCache.delete(@cache_name, min) + + transaction_id == min -> + put_transaction(transaction_id, transaction) + end + else + insert_transaction(transaction_id, transaction, ids) + end + end) + end + + defp insert_transaction(transaction_id, transaction, ids) do + put_transaction(transaction_id, transaction) + + ConCache.put(@cache_name, @transactions_ids_key, insert_sorted(transaction_id, ids)) + end + + defp put_transaction(transaction_id, transaction) do + full_transaction = Repo.preload(transaction, @preloads) + + ConCache.put(@cache_name, transaction_id, full_transaction) + end + + defp insert_sorted(id, ids) do + case ids do + [] -> + [id] + + [head | tail] -> + cond do + head > id -> [head | insert_sorted(id, tail)] + head < id -> [id | ids] + head == id -> ids + end + end + end +end diff --git a/apps/explorer/lib/explorer/exchange_rates/source/transaction_and_log.ex b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex similarity index 90% rename from apps/explorer/lib/explorer/exchange_rates/source/transaction_and_log.ex rename to apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex index 2b8699accc..03234ff649 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/transaction_and_log.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex @@ -1,6 +1,6 @@ -defmodule Explorer.ExchangeRates.Source.TransactionAndLog do +defmodule Explorer.ExchangeRates.Source.TokenBridge do @moduledoc """ - Adapter for calculating the market cap and total supply from logs and transactions + Adapter for calculating the market cap and total supply from token bridge while still getting other info like price in dollars and bitcoin from a secondary source """ diff --git a/apps/explorer/test/explorer/chain/supply/rsk_test.exs b/apps/explorer/test/explorer/chain/supply/rsk_test.exs index 40aa0a831b..71d3a530bb 100644 --- a/apps/explorer/test/explorer/chain/supply/rsk_test.exs +++ b/apps/explorer/test/explorer/chain/supply/rsk_test.exs @@ -1,32 +1,30 @@ defmodule Explorer.Chain.Supply.RSKTest do use Explorer.DataCase + import Mox + alias Explorer.Chain.Supply.RSK - alias Explorer.Chain.Wei + alias Explorer.ExchangeRates.Token @coin_address "0x0000000000000000000000000000000001000006" - - defp wei!(value) do - {:ok, wei} = Wei.cast(value) - wei - end + @mult 1_000_000_000_000_000_000 test "total is 21_000_000" do - assert RSK.total() == 21_000_000 + assert Decimal.equal?(RSK.total(), Decimal.new(21_000_000)) end - describe "circulating/0" do - test "with no balance" do - assert RSK.circulating() == wei!(0) - end - - test "with a balance" do - address = insert(:address, hash: @coin_address) - insert(:block, number: 0) + describe "market_cap/1" do + @tag :no_parity + @tag :no_geth + test "calculates market_cap" do + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [%{id: id, method: "eth_getBalance"}], _options -> + {:ok, [%{id: id, result: "20999999999900000000000000"}]} + end) - insert(:fetched_balance, value: 10, address_hash: address.hash, block_number: 0) + exchange_rate = %{Token.null() | usd_value: Decimal.new(1_000_000)} - assert RSK.circulating() == wei!(10) + assert Decimal.equal?(RSK.market_cap(exchange_rate), Decimal.new(100.0000)) end end @@ -47,9 +45,9 @@ defmodule Explorer.Chain.Supply.RSKTest do assert RSK.supply_for_days(2) == {:ok, %{ - date(now, days: -2) => dec(0), - date(now, days: -1) => dec(0), - date(now) => dec(0) + date(now, days: -2) => dec(21_000_000), + date(now, days: -1) => dec(21_000_000), + date(now) => dec(21_000_000) }} end @@ -59,14 +57,14 @@ defmodule Explorer.Chain.Supply.RSKTest do insert(:block, number: 0, timestamp: Timex.shift(now, days: -10)) - insert(:fetched_balance, value: 10, address_hash: address.hash, block_number: 0) + insert(:fetched_balance, value: 10 * @mult, address_hash: address.hash, block_number: 0) assert RSK.supply_for_days(2) == {:ok, %{ - date(now, days: -2) => dec(10), - date(now, days: -1) => dec(10), - date(now) => dec(10) + date(now, days: -2) => dec(20_999_990), + date(now, days: -1) => dec(20_999_990), + date(now) => dec(20_999_990) }} end @@ -77,16 +75,16 @@ defmodule Explorer.Chain.Supply.RSKTest do insert(:block, number: 0, timestamp: Timex.shift(now, days: -10)) insert(:block, number: 1, timestamp: Timex.shift(now, days: -1)) - insert(:fetched_balance, value: 10, address_hash: address.hash, block_number: 0) + insert(:fetched_balance, value: 10 * @mult, address_hash: address.hash, block_number: 0) - insert(:fetched_balance, value: 20, address_hash: address.hash, block_number: 1) + insert(:fetched_balance, value: 20 * @mult, address_hash: address.hash, block_number: 1) assert RSK.supply_for_days(2) == {:ok, %{ - date(now, days: -2) => dec(10), - date(now, days: -1) => dec(20), - date(now) => dec(20) + date(now, days: -2) => dec(20_999_990), + date(now, days: -1) => dec(20_999_980), + date(now) => dec(20_999_980) }} end @@ -98,18 +96,18 @@ defmodule Explorer.Chain.Supply.RSKTest do insert(:block, number: 1, timestamp: Timex.shift(now, days: -2)) insert(:block, number: 2, timestamp: Timex.shift(now, days: -1)) - insert(:fetched_balance, value: 5, address_hash: address.hash, block_number: 0) + insert(:fetched_balance, value: 5 * @mult, address_hash: address.hash, block_number: 0) - insert(:fetched_balance, value: 10, address_hash: address.hash, block_number: 1) + insert(:fetched_balance, value: 10 * @mult, address_hash: address.hash, block_number: 1) - insert(:fetched_balance, value: 20, address_hash: address.hash, block_number: 2) + insert(:fetched_balance, value: 20 * @mult, address_hash: address.hash, block_number: 2) assert RSK.supply_for_days(2) == {:ok, %{ - date(now, days: -2) => dec(10), - date(now, days: -1) => dec(20), - date(now) => dec(20) + date(now, days: -2) => dec(20_999_990), + date(now, days: -1) => dec(20_999_980), + date(now) => dec(20_999_980) }} end @@ -122,17 +120,17 @@ defmodule Explorer.Chain.Supply.RSKTest do insert(:block, number: 2, timestamp: Timex.shift(now, days: -1)) insert(:block, number: 3, timestamp: now) - insert(:fetched_balance, value: 5, address_hash: address.hash, block_number: 0) - insert(:fetched_balance, value: 10, address_hash: address.hash, block_number: 1) - insert(:fetched_balance, value: 20, address_hash: address.hash, block_number: 2) - insert(:fetched_balance, value: 30, address_hash: address.hash, block_number: 3) + insert(:fetched_balance, value: 5 * @mult, address_hash: address.hash, block_number: 0) + insert(:fetched_balance, value: 10 * @mult, address_hash: address.hash, block_number: 1) + insert(:fetched_balance, value: 20 * @mult, address_hash: address.hash, block_number: 2) + insert(:fetched_balance, value: 30 * @mult, address_hash: address.hash, block_number: 3) assert RSK.supply_for_days(2) == {:ok, %{ - date(now, days: -2) => dec(10), - date(now, days: -1) => dec(20), - date(now) => dec(30) + date(now, days: -2) => dec(20_999_990), + date(now, days: -1) => dec(20_999_980), + date(now) => dec(20_999_970) }} end end diff --git a/apps/explorer/test/explorer/chain/supply/transaction_and_log_test.exs b/apps/explorer/test/explorer/chain/supply/transaction_and_log_test.exs deleted file mode 100644 index 5126d7acaf..0000000000 --- a/apps/explorer/test/explorer/chain/supply/transaction_and_log_test.exs +++ /dev/null @@ -1,122 +0,0 @@ -defmodule Explorer.Chain.Supply.TransactionAndLogTest do - use Explorer.DataCase - alias Explorer.Chain - alias Explorer.Chain.Supply.TransactionAndLog - - setup do - {:ok, burn_address_hash} = Chain.string_to_address_hash("0x0000000000000000000000000000000000000000") - - burn_address = - case Chain.hash_to_address(burn_address_hash) do - {:ok, burn_address} -> burn_address - {:error, :not_found} -> insert(:address, hash: "0x0000000000000000000000000000000000000000") - end - - {:ok, %{burn_address: burn_address}} - end - - describe "total/1" do - test "today with no mints or burns brings zero" do - assert TransactionAndLog.total(Timex.now()) == Decimal.new(0) - end - - test "today with mints and burns calculates a value", %{burn_address: burn_address} do - old_block = insert(:block, timestamp: Timex.shift(Timex.now(), days: -1), number: 1000) - - insert(:log, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 2), - first_topic: "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a", - data: "0x0000000000000000000000000000000000000000000000008ac7230489e80000" - ) - - insert(:internal_transaction, - index: 527, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 3), - to_address: burn_address, - value: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" - ) - - assert TransactionAndLog.total(Timex.now()) == Decimal.new(9) - end - - test "yesterday with mints and burns calculates a value ignoring whatever happened today", %{ - burn_address: burn_address - } do - old_block = insert(:block, timestamp: Timex.shift(Timex.now(), days: -1), number: 1000) - - insert(:log, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 2), - first_topic: "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a", - data: "0x0000000000000000000000000000000000000000000000008ac7230489e80000" - ) - - new_block = insert(:block, timestamp: Timex.now(), number: 1001) - - insert(:internal_transaction, - index: 527, - transaction: - insert(:transaction, block: new_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 3), - to_address: burn_address, - value: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" - ) - - assert TransactionAndLog.total(Timex.shift(Timex.now(), days: -1)) == Decimal.new(10) - end - end - - describe "total/0" do - test "calculates the same value as total/1 receiving today's date", %{burn_address: burn_address} do - old_block = insert(:block, timestamp: Timex.shift(Timex.now(), days: -1), number: 1000) - - insert(:log, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 2), - first_topic: "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a", - data: "0x0000000000000000000000000000000000000000000000008ac7230489e80000" - ) - - insert(:internal_transaction, - index: 527, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 3), - to_address: burn_address, - value: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" - ) - - assert TransactionAndLog.total() == TransactionAndLog.total(Timex.now()) - end - end - - describe "supply_for_days/1" do - test "bring the supply of today and yesterday when receiving 2", %{burn_address: burn_address} do - old_block = insert(:block, timestamp: Timex.shift(Timex.now(), days: -1), number: 1000) - - insert(:log, - transaction: - insert(:transaction, block: old_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 2), - first_topic: "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a", - data: "0x0000000000000000000000000000000000000000000000008ac7230489e80000" - ) - - new_block = insert(:block, timestamp: Timex.now(), number: 1001) - - insert(:internal_transaction, - index: 527, - transaction: - insert(:transaction, block: new_block, block_number: 1000, cumulative_gas_used: 1, gas_used: 1, index: 3), - to_address: burn_address, - value: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" - ) - - expected_result = %{ - Timex.shift(Timex.today(), days: -1) => Decimal.new(10), - Timex.today() => Decimal.new(9) - } - - assert TransactionAndLog.supply_for_days(2) == {:ok, expected_result} - end - end -end diff --git a/apps/explorer/test/explorer/chain/transactions_cache_test.exs b/apps/explorer/test/explorer/chain/transactions_cache_test.exs new file mode 100644 index 0000000000..a72055c276 --- /dev/null +++ b/apps/explorer/test/explorer/chain/transactions_cache_test.exs @@ -0,0 +1,95 @@ +defmodule Explorer.Chain.TransactionsCacheTest do + use Explorer.DataCase + + alias Explorer.Chain.TransactionsCache + alias Explorer.Repo + + @size 51 + + describe "update/1" do + test "adds a new value to a new cache with preloads" do + transaction = insert(:transaction) |> preload_all() + + TransactionsCache.update(transaction) + + assert TransactionsCache.take(1) == [transaction] + end + + test "adds several elements, removing the oldest when necessary" do + transactions = + 1..@size + |> Enum.map(fn n -> + block = insert(:block, number: n) + insert(:transaction) |> with_block(block) + end) + + TransactionsCache.update(transactions) + + assert TransactionsCache.all() == Enum.reverse(preload_all(transactions)) + + more_transactions = + (@size + 1)..(@size + 10) + |> Enum.map(fn n -> + block = insert(:block, number: n) + insert(:transaction) |> with_block(block) + end) + + TransactionsCache.update(more_transactions) + + kept_transactions = + Enum.reverse(transactions ++ more_transactions) + |> Enum.take(@size) + |> preload_all() + + assert TransactionsCache.take(@size) == kept_transactions + end + + test "does not add a transaction too old when full" do + transactions = + 10..(@size + 9) + |> Enum.map(fn n -> + block = insert(:block, number: n) + insert(:transaction) |> with_block(block) + end) + + TransactionsCache.update(transactions) + + loaded_transactions = Enum.reverse(preload_all(transactions)) + assert TransactionsCache.all() == loaded_transactions + + block = insert(:block, number: 1) + insert(:transaction) |> with_block(block) |> TransactionsCache.update() + + assert TransactionsCache.all() == loaded_transactions + end + + test "adds intermediate transactions" do + blocks = 1..10 |> Map.new(fn n -> {n, insert(:block, number: n)} end) + + insert(:transaction) |> with_block(blocks[1]) |> TransactionsCache.update() + insert(:transaction) |> with_block(blocks[10]) |> TransactionsCache.update() + + assert TransactionsCache.size() == 2 + + insert(:transaction) |> with_block(blocks[5]) |> TransactionsCache.update() + + assert TransactionsCache.size() == 3 + end + end + + defp preload_all(transactions) when is_list(transactions) do + Enum.map(transactions, &preload_all(&1)) + end + + defp preload_all(transaction) do + Repo.preload(transaction, [ + :block, + created_contract_address: :names, + from_address: :names, + to_address: :names, + token_transfers: :token, + token_transfers: :from_address, + token_transfers: :to_address + ]) + end +end diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index 91a4bff8db..cfb8b5ab14 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -50,6 +50,24 @@ defmodule Explorer.ChainTest do end end + describe "last_block_status/0" do + test "return no_blocks errors if db is empty" do + assert {:error, :no_blocks} = Chain.last_block_status() + end + + test "returns {:ok, last_block_period} if block is in healthy period" do + insert(:block, consensus: true) + + assert {:ok, _, _} = Chain.last_block_status() + end + + test "return {:ok, last_block_period} if block is not in healthy period" do + insert(:block, consensus: true, timestamp: Timex.shift(DateTime.utc_now(), hours: -50)) + + assert {:error, _, _} = Chain.last_block_status() + end + end + describe "address_to_logs/2" do test "fetches logs" do address = insert(:address) diff --git a/apps/explorer/test/explorer/exchange_rates/source/transaction_and_log_test.exs b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs similarity index 78% rename from apps/explorer/test/explorer/exchange_rates/source/transaction_and_log_test.exs rename to apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs index 47aa09f805..d5bd5f9b96 100644 --- a/apps/explorer/test/explorer/exchange_rates/source/transaction_and_log_test.exs +++ b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs @@ -1,6 +1,6 @@ -defmodule Explorer.ExchangeRates.Source.TransactionAndLogTest do +defmodule Explorer.ExchangeRates.Source.TokenBridgeTest do use Explorer.DataCase - alias Explorer.ExchangeRates.Source.TransactionAndLog + alias Explorer.ExchangeRates.Source.TokenBridge alias Explorer.ExchangeRates.Token @json """ @@ -27,7 +27,7 @@ defmodule Explorer.ExchangeRates.Source.TransactionAndLogTest do describe "format_data/1" do test "bring a list with one %Token{}" do - assert [%Token{}] = TransactionAndLog.format_data(@json) + assert [%Token{}] = TokenBridge.format_data(@json) end end end diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex index c201932cef..2ec7cde365 100644 --- a/apps/explorer/test/support/data_case.ex +++ b/apps/explorer/test/support/data_case.ex @@ -42,6 +42,8 @@ defmodule Explorer.DataCase do Explorer.Chain.BlockNumberCache.setup() Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.BlocksCache.cache_name()}) Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.BlocksCache.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) + Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.TransactionsCache.cache_name()}) :ok end diff --git a/apps/indexer/config/dev/parity.exs b/apps/indexer/config/dev/parity.exs index d6e300f077..7a5b31a424 100644 --- a/apps/indexer/config/dev/parity.exs +++ b/apps/indexer/config/dev/parity.exs @@ -34,7 +34,7 @@ config :indexer, # ] # ], subscribe_named_arguments: [ - transport: EthereumJSONRPC.WebSocket, + transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" diff --git a/apps/indexer/config/dev/rsk.exs b/apps/indexer/config/dev/rsk.exs index 21138634f5..3f7399e892 100644 --- a/apps/indexer/config/dev/rsk.exs +++ b/apps/indexer/config/dev/rsk.exs @@ -19,7 +19,7 @@ config :indexer, variant: EthereumJSONRPC.RSK ], subscribe_named_arguments: [ - transport: EthereumJSONRPC.WebSocket, + transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, transport_options: [ web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, url: System.get_env("ETHEREUM_JSONRPC_WS_URL") || "ws://localhost:8546" diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index 4d4cd978ec..b436d61e03 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -11,7 +11,7 @@ defmodule Indexer.Block.Fetcher do alias EthereumJSONRPC.{Blocks, FetchedBeneficiaries} alias Explorer.Chain - alias Explorer.Chain.{Address, Block, BlockNumberCache, BlocksCache, Hash, Import, Transaction} + alias Explorer.Chain.{Address, Block, BlockNumberCache, BlocksCache, Hash, Import, Transaction, TransactionsCache} alias Indexer.Block.Fetcher.Receipts alias Indexer.Fetcher.{ @@ -173,6 +173,7 @@ defmodule Indexer.Block.Fetcher do ) do result = {:ok, %{inserted: inserted, errors: blocks_errors}} update_block_cache(inserted[:blocks]) + update_transactions_cache(inserted[:transactions]) result else {step, {:error, reason}} -> {:error, {step, reason}} @@ -189,6 +190,10 @@ defmodule Indexer.Block.Fetcher do BlocksCache.update_blocks(blocks) end + defp update_transactions_cache(transactions) do + TransactionsCache.update(transactions) + end + def import( %__MODULE__{broadcast: broadcast, callback_module: callback_module} = state, options diff --git a/docs/env-variables.md b/docs/env-variables.md index 4cbef49e82..0c93460150 100644 --- a/docs/env-variables.md +++ b/docs/env-variables.md @@ -21,7 +21,7 @@ Below is a table outlining the environment variables utilized by BlockScout. | `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | | `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | | `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | -| `SOURCE_MODULE` | | This environment variable is used to calculate the total supply and is specifically used by the xDai Chain. | false | all | +| `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all | | `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all | | `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all | | `ECTO_USE_SSL`| | Production environment variable to use SSL on Ecto queries. | true | all | @@ -33,7 +33,7 @@ Below is a table outlining the environment variables utilized by BlockScout. | `HEART_COMMAND` | | Production environment variable to restart the application in the event of a crash. | systemctl restart explorer.service | all | | `BLOCKSCOUT_VERSION` | | Added to the footer to signify the current BlockScout version. | (empty) | v1.3.4+ | | `RELEASE_LINK` | | The link to Blockscout release notes in the footer. | https://github.com/poanetwork/
          blockscout/releases/
          tag/${BLOCKSCOUT_VERSION} | v1.3.5+ | -| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | +| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | | `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base | v1.3.4+ | | `GRAPHIQL _TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) | v1.3.4+ | | `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 | v1.3.8+ |