Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add sanction tag to read contract controllers + templates #983

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Add sanction tag to read contract controllers + templates #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb19494
Add sanctioned addresses to read contract + proxy controller & token …
rkachowski Oct 18, 2023
725e12e
Fix checks.
rkachowski Oct 18, 2023
cbd99a4
Merge branch 'master' into dhutch/fix-contract-read
rkachowski Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ defmodule BlockScoutWeb.AddressReadContractController do
type: :regular,
action: :read,
custom_abi: custom_abi?,
exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null()
exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
sanctions: Explorer.Celo.SanctionCache.get_sanction_list()
]

with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
Expand Down
3 changes: 2 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ defmodule BlockScoutWeb.AddressReadProxyController do
exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(),
counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}),
tags: get_address_tags(address_hash, current_user(conn)),
celo_epoch: EpochUtil.get_address_summary(address)
celo_epoch: EpochUtil.get_address_summary(address),
sanctions: Explorer.Celo.SanctionCache.get_sanction_list()
)
else
_ ->
Expand Down
4 changes: 3 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/controllers/tokens/contract_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ defmodule BlockScoutWeb.Tokens.ContractController do
import BlockScoutWeb.Models.GetAddressTags, only: [get_address_tags: 2]

alias BlockScoutWeb.{AccessHelpers, TabHelpers}
alias Explorer.Celo.SanctionCache
alias Explorer.{Chain, Market}
alias Explorer.Chain.Address

Expand Down Expand Up @@ -37,7 +38,8 @@ defmodule BlockScoutWeb.Tokens.ContractController do
action: action,
token: Market.add_price(token),
counters_path: token_path(conn, :token_counters, %{"id" => Address.checksum(address_hash)}),
tags: get_address_tags(address_hash, current_user(conn))
tags: get_address_tags(address_hash, current_user(conn)),
sanctions: SanctionCache.get_sanction_list()
)
else
{:restricted_access, _} ->
Expand Down
6 changes: 5 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
tags: @tags,
celo_epoch: @celo_epoch
%>
<%
{:ok, sanctions} = Jason.encode(@sanctions)
%>

<div class="card">
<%= render BlockScoutWeb.AddressView, "_tabs.html", address: @address, is_proxy: is_proxy, conn: @conn %>
<div id="sanctions" data-sanctions=<%= sanctions %> hidden ></div>
<%= render BlockScoutWeb.AddressView, "_tabs.html", address: @address, is_proxy: is_proxy, conn: @conn %>
<%= if @need_wallet do %>
<div class="card-misc-container">
<%= render BlockScoutWeb.SmartContractView, "_connect_container.html" %>
Expand Down
4 changes: 4 additions & 0 deletions apps/block_scout_web/lib/block_scout_web/templates/address_read_proxy/index.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
tags: @tags,
celo_epoch: @celo_epoch
%>
<%
{:ok, sanctions} = Jason.encode(@sanctions)
%>

<div class="card">
<div id="sanctions" data-sanctions=<%= sanctions %> hidden ></div>
<%= render BlockScoutWeb.AddressView, "_tabs.html", address: @address, is_proxy: is_proxy, conn: @conn %>
<!-- loaded via AJAX -->
<div class="card-body" data-smart-contract-functions data-hash="<%= to_string(@address.hash) %>" data-type="<%= @type %>" data-action="<%= @action %>" data-url="<%= smart_contract_path(@conn, :index) %>">
Expand Down
5 changes: 5 additions & 0 deletions apps/block_scout_web/lib/block_scout_web/templates/tokens/contract/index.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
conn: @conn
) %>

<%
{:ok, sanctions} = Jason.encode(@sanctions)
%>

<section>
<div class="card">
<div id="sanctions" data-sanctions=<%= sanctions %> hidden ></div>
<%= render OverviewView, "_tabs.html", assigns %>
<!-- loaded via AJAX -->
<div class="card-body" data-smart-contract-functions data-hash="<%= Address.checksum(@token.contract_address.hash) %>" data-type="<%= @type %>" data-action="<%= @action %>" data-url="<%= smart_contract_path(@conn, :index) %>">
Expand Down
14 changes: 7 additions & 7 deletions apps/block_scout_web/priv/gettext/default.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ msgstr ""
msgid "Current transaction state: Success, Failed (Error), or Pending (In Process)"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:29
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:33
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:32
#, elixir-autogen, elixir-format
msgid "Custom"
Expand All @@ -932,7 +932,7 @@ msgstr ""
msgid "Custom ABI"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:34
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:38
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:37
#, elixir-autogen, elixir-format
msgid "Custom ABI from account"
Expand Down Expand Up @@ -1566,13 +1566,13 @@ msgstr ""
#: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:99
#: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:49
#: lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex:45
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:50
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:58
#: lib/block_scout_web/templates/address_read_proxy/index.html.eex:21
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:54
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:62
#: lib/block_scout_web/templates/address_read_proxy/index.html.eex:25
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:53
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:61
#: lib/block_scout_web/templates/address_write_proxy/index.html.eex:26
#: lib/block_scout_web/templates/tokens/contract/index.html.eex:17
#: lib/block_scout_web/templates/tokens/contract/index.html.eex:22
#, elixir-autogen, elixir-format
msgid "Loading..."
msgstr ""
Expand Down Expand Up @@ -2986,7 +2986,7 @@ msgstr ""
msgid "Value"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:26
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:30
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:29
#: lib/block_scout_web/templates/verified_contracts/_tile.html.eex:49
#: lib/block_scout_web/templates/verified_contracts/index.html.eex:74
Expand Down
14 changes: 7 additions & 7 deletions apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ msgstr ""
msgid "Current transaction state: Success, Failed (Error), or Pending (In Process)"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:29
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:33
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:32
#, elixir-autogen, elixir-format
msgid "Custom"
Expand All @@ -932,7 +932,7 @@ msgstr ""
msgid "Custom ABI"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:34
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:38
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:37
#, elixir-autogen, elixir-format
msgid "Custom ABI from account"
Expand Down Expand Up @@ -1566,13 +1566,13 @@ msgstr ""
#: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:99
#: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:49
#: lib/block_scout_web/templates/address_contract_verification_vyper/new.html.eex:45
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:50
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:58
#: lib/block_scout_web/templates/address_read_proxy/index.html.eex:21
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:54
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:62
#: lib/block_scout_web/templates/address_read_proxy/index.html.eex:25
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:53
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:61
#: lib/block_scout_web/templates/address_write_proxy/index.html.eex:26
#: lib/block_scout_web/templates/tokens/contract/index.html.eex:17
#: lib/block_scout_web/templates/tokens/contract/index.html.eex:22
#, elixir-autogen, elixir-format
msgid "Loading..."
msgstr ""
Expand Down Expand Up @@ -2986,7 +2986,7 @@ msgstr ""
msgid "Value"
msgstr ""

#: lib/block_scout_web/templates/address_read_contract/index.html.eex:26
#: lib/block_scout_web/templates/address_read_contract/index.html.eex:30
#: lib/block_scout_web/templates/address_write_contract/index.html.eex:29
#: lib/block_scout_web/templates/verified_contracts/_tile.html.eex:49
#: lib/block_scout_web/templates/verified_contracts/index.html.eex:74
Expand Down
Loading