From 019916096d2adee22b9355387657efdea9fd9ce1 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 28 Aug 2020 15:55:35 +0300 Subject: [PATCH] Bridged tokens table --- CHANGELOG.md | 1 + .../tokens/bridged_tokens_controller.ex | 60 +++++++++++++++++++ .../templates/bridged_tokens/_tile.html.eex | 36 +++++++++++ .../templates/bridged_tokens/index.html.eex | 45 ++++++++++++++ .../templates/layout/_topnav.html.eex | 39 +++++++++--- .../templates/layout/app.html.eex | 1 + .../views/bridged_tokens_view.ex | 22 +++++++ .../lib/block_scout_web/web_router.ex | 2 + apps/block_scout_web/priv/gettext/default.pot | 32 ++++++---- .../priv/gettext/en/LC_MESSAGES/default.po | 32 ++++++---- apps/explorer/lib/explorer/chain.ex | 22 +++++++ 11 files changed, 264 insertions(+), 28 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/tokens/bridged_tokens_controller.ex create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/_tile.html.eex create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/index.html.eex create mode 100644 apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index b91644d075..db30d5accb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3261](https://github.com/poanetwork/blockscout/pull/3261) - Bridged tokens table ### Fixes - [#3256](https://github.com/poanetwork/blockscout/pull/3256) - Fix for invisible validator address at block page and wrong alert text color at xDai diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/tokens/bridged_tokens_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/bridged_tokens_controller.ex new file mode 100644 index 0000000000..815077567f --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/controllers/tokens/bridged_tokens_controller.ex @@ -0,0 +1,60 @@ +defmodule BlockScoutWeb.BridgedTokensController do + use BlockScoutWeb, :controller + + import BlockScoutWeb.Chain, only: [paging_options: 1, next_page_params: 3, split_list_by_page: 1] + + alias BlockScoutWeb.BridgedTokensView + alias Explorer.Chain + alias Phoenix.View + + def index(conn, %{"type" => "JSON"} = params) do + tokens = + params + |> paging_options() + |> Chain.list_top_bridged_tokens() + + {tokens_page, next_page} = split_list_by_page(tokens) + + next_page_path = + case next_page_params(next_page, tokens_page, params) do + nil -> + nil + + next_page_params -> + tokens_path( + conn, + :index, + Map.delete(next_page_params, "type") + ) + end + + items = + tokens_page + |> Enum.with_index(1) + |> Enum.map(fn {token, index} -> + View.render_to_string( + BridgedTokensView, + "_tile.html", + token: token, + index: index + ) + end) + + json( + conn, + %{ + items: items, + next_page_path: next_page_path + } + ) + end + + def index(conn, _params) do + total_supply = Chain.total_supply() + + render(conn, "index.html", + current_path: current_path(conn), + total_supply: total_supply + ) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/_tile.html.eex new file mode 100644 index 0000000000..094a16442a --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/_tile.html.eex @@ -0,0 +1,36 @@ + + + + + <%= @index %> + + + + <% token = token_display_name(@token) %> + <%= link(token, + to: token_path(BlockScoutWeb.Endpoint, :show, @token.contract_address_hash), + "data-test": "token_link", + class: "text-truncate") %> + + + <%= render BlockScoutWeb.AddressView, + "_link.html", + address: @token.contract_address, + contract: true, + use_custom_tooltip: false + %> + + + <%= if decimals?(@token) do %> + <%= format_according_to_decimals(@token.total_supply, @token.decimals) %> + <% else %> + <%= format_integer_to_currency(@token.total_supply) %> + <% end %> <%= @token.symbol %> + + + + + <%= @token.holder_count %> + + + diff --git a/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/index.html.eex new file mode 100644 index 0000000000..5b76450d69 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/bridged_tokens/index.html.eex @@ -0,0 +1,45 @@ +
+
+
+

<%= gettext "Bridged Tokens" %>

+ + <%= 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, "_table-loader.html", total_supply: @total_supply %> + +
+
 
+ 		+
Token
+ 		+
Address
+ 		+
+ Total Supply +
+ 		+
+ Holders 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/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 4d0ef2d6c9..631c92493d 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -75,14 +75,37 @@ <%= gettext("Accounts") %> <% end %> -
  • - <%= link to: tokens_path(@conn, :index), class: "nav-link topnav-nav-link #{tab_status("tokens", @conn.request_path)}" do %> - - <%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %> - - <%= gettext("Tokens") %> - <% end %> -
    • + <%= if Application.get_env(:block_scout_web, :multi_token_bridge_mediator) && Application.get_env(:block_scout_web, :multi_token_bridge_mediator) != "" do %> +
  • + +
    + <%= link( + gettext("All"), + class: "dropdown-item #{tab_status("tokens", @conn.request_path)}", + to: tokens_path(@conn, :index) + ) %> + <%= link( + gettext("Bridged"), + class: "dropdown-item #{tab_status("tokens", @conn.request_path)}", + to: bridged_tokens_path(@conn, :index) + ) %> +
    +
    • + <% else %> +
  • + <%= link to: tokens_path(@conn, :index), class: "nav-link topnav-nav-link #{tab_status("tokens", @conn.request_path)}" do %> + + <%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %> + + <%= gettext("Tokens") %> + <% end %> +
    • + <% end %> <% end %> <%= if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter)[:reading_enabled] || Application.get_env(:block_scout_web, :api_url) do %>
  • diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex index d5d6d42f16..3634ac4089 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex @@ -70,6 +70,7 @@ @view_module != Elixir.BlockScoutWeb.BlockView && @view_module != Elixir.BlockScoutWeb.BlockTransactionView && @view_module != Elixir.BlockScoutWeb.AddressView && + @view_module != Elixir.BlockScoutWeb.BridgedTokensView && @view_module != Elixir.BlockScoutWeb.TokensView && @view_module != Elixir.BlockScoutWeb.TransactionView && @view_module != Elixir.BlockScoutWeb.PendingTransactionView && diff --git a/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex b/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex new file mode 100644 index 0000000000..edede8b19c --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex @@ -0,0 +1,22 @@ +defmodule BlockScoutWeb.BridgedTokensView do + use BlockScoutWeb, :view + + alias Explorer.Chain.Token + + def decimals?(%Token{decimals: nil}), do: false + def decimals?(%Token{decimals: _}), do: true + + def token_display_name(%Token{name: nil, symbol: nil}), do: "" + + def token_display_name(%Token{name: "", symbol: ""}), do: "" + + def token_display_name(%Token{name: name, symbol: nil}), do: name + + def token_display_name(%Token{name: name, symbol: ""}), do: name + + def token_display_name(%Token{name: nil, symbol: symbol}), do: symbol + + def token_display_name(%Token{name: "", symbol: symbol}), do: symbol + + def token_display_name(%Token{name: name, symbol: symbol}), do: "#{name} (#{symbol})" +end diff --git a/apps/block_scout_web/lib/block_scout_web/web_router.ex b/apps/block_scout_web/lib/block_scout_web/web_router.ex index e3ded70a53..a9dc6c740e 100644 --- a/apps/block_scout_web/lib/block_scout_web/web_router.ex +++ b/apps/block_scout_web/lib/block_scout_web/web_router.ex @@ -75,6 +75,8 @@ defmodule BlockScoutWeb.WebRouter do resources("/tokens", TokensController, only: [:index]) + resources("/bridged_tokens", BridgedTokensController, only: [:index]) + resources "/address", AddressController, only: [:show] do resources("/transactions", AddressTransactionController, only: [:index], as: :transaction) diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 3ab61b8455..c791fa4691 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -107,7 +107,7 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:93 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:116 msgid "APIs" msgstr "" @@ -138,6 +138,7 @@ msgstr "" #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:25 #: lib/block_scout_web/templates/address_transaction/index.html.eex:23 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:88 #: lib/block_scout_web/views/address_internal_transaction_view.ex:8 #: lib/block_scout_web/views/address_token_transfer_view.ex:8 #: lib/block_scout_web/views/address_transaction_view.ex:10 @@ -631,7 +632,7 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:107 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:130 msgid "Eth RPC" msgstr "" @@ -732,7 +733,7 @@ msgid "Github" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:97 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:120 msgid "GraphQL" msgstr "" @@ -1186,7 +1187,7 @@ msgid "Query" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:102 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:125 msgid "RPC" msgstr "" @@ -1244,13 +1245,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:172 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:203 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:195 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:226 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:166 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:189 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1852,7 +1853,8 @@ msgstr "" #: lib/block_scout_web/templates/address/_tabs.html.eex:17 #: lib/block_scout_web/templates/address_token/index.html.eex:8 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:11 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:83 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:84 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:105 #: lib/block_scout_web/templates/tokens/index.html.eex:4 #: lib/block_scout_web/views/address_view.ex:343 msgid "Tokens" @@ -1934,7 +1936,7 @@ msgid "Write Proxy" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:120 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 msgid "Apps" msgstr "" @@ -1944,7 +1946,7 @@ msgid "Copy Raw Trace" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:170 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:193 msgid "Search by address, token symbol, name, transaction hash, or block number" msgstr "" @@ -1973,3 +1975,13 @@ msgstr "" #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:10 msgid "page" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:93 +msgid "Bridged" +msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/bridged_tokens/index.html.eex:4 +msgid "Bridged Tokens" +msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 3ab61b8455..c791fa4691 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -107,7 +107,7 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:93 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:116 msgid "APIs" msgstr "" @@ -138,6 +138,7 @@ msgstr "" #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:25 #: lib/block_scout_web/templates/address_transaction/index.html.eex:23 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:88 #: lib/block_scout_web/views/address_internal_transaction_view.ex:8 #: lib/block_scout_web/views/address_token_transfer_view.ex:8 #: lib/block_scout_web/views/address_transaction_view.ex:10 @@ -631,7 +632,7 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:107 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:130 msgid "Eth RPC" msgstr "" @@ -732,7 +733,7 @@ msgid "Github" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:97 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:120 msgid "GraphQL" msgstr "" @@ -1186,7 +1187,7 @@ msgid "Query" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:102 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:125 msgid "RPC" msgstr "" @@ -1244,13 +1245,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:172 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:203 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:195 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:226 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:166 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:189 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1852,7 +1853,8 @@ msgstr "" #: lib/block_scout_web/templates/address/_tabs.html.eex:17 #: lib/block_scout_web/templates/address_token/index.html.eex:8 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:11 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:83 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:84 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:105 #: lib/block_scout_web/templates/tokens/index.html.eex:4 #: lib/block_scout_web/views/address_view.ex:343 msgid "Tokens" @@ -1934,7 +1936,7 @@ msgid "Write Proxy" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:120 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 msgid "Apps" msgstr "" @@ -1944,7 +1946,7 @@ msgid "Copy Raw Trace" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:170 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:193 msgid "Search by address, token symbol, name, transaction hash, or block number" msgstr "" @@ -1973,3 +1975,13 @@ msgstr "" #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:10 msgid "page" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:93 +msgid "Bridged" +msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/bridged_tokens/index.html.eex:4 +msgid "Bridged Tokens" +msgstr "" diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 51649259b6..0bfca51e4e 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -1798,6 +1798,13 @@ defmodule Explorer.Chain do fetch_top_tokens(paging_options) end + @spec list_top_bridged_tokens :: [{Token.t(), non_neg_integer()}] + def list_top_bridged_tokens(options \\ []) do + paging_options = Keyword.get(options, :paging_options, @default_paging_options) + + fetch_top_bridged_tokens(paging_options) + end + defp fetch_top_tokens(paging_options) do base_query = from(t in Token, @@ -1812,6 +1819,21 @@ defmodule Explorer.Chain do |> Repo.all() end + defp fetch_top_bridged_tokens(paging_options) do + base_query = + from(t in Token, + where: t.total_supply > ^0, + where: t.bridged, + order_by: [desc: t.holder_count, asc: t.name], + preload: [:contract_address] + ) + + base_query + |> page_tokens(paging_options) + |> limit(^paging_options.page_size) + |> Repo.all() + end + @doc """ Calls `reducer` on a stream of `t:Explorer.Chain.Block.t/0` without `t:Explorer.Chain.Block.Reward.t/0`. """