CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: display init for selfdestructed contracts.

Browse Source
pull/1954/head
zachdaniel 6 years ago
parent e1c7ef8c73
commit 6c85f8b7e4
7 changed files with 134 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 32
      apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
  3. 13
      apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
  4. 53
      apps/block_scout_web/priv/gettext/default.pot
  5. 57
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
  6. 2
      apps/explorer/lib/explorer/chain/internal_transaction/result.ex
  7. 4
      apps/explorer/test/explorer/chain/internal_transaction_test.exs

1
CHANGELOG.md
Unescape View File

@ -22,6 +22,7 @@
- [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks - [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks
- [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc - [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc
- [#1952](https://github.com/poanetwork/blockscout/pull/1952) - feat: exclude empty contracts by default - [#1952](https://github.com/poanetwork/blockscout/pull/1952) - feat: exclude empty contracts by default
- [#1954](https://github.com/poanetwork/blockscout/pull/1954) - feat: use creation init on self destruct
### Fixes ### Fixes

32
apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
Unescape View File

@ -1,9 +1,16 @@
<% contract_creation_code = contract_creation_code(@address) %>
<section class="container"> <section class="container">
<%= render BlockScoutWeb.AddressView, "overview.html", assigns %> <%= render BlockScoutWeb.AddressView, "overview.html", assigns %>
<div class="card"> <div class="card">
<%= render BlockScoutWeb.AddressView, "_tabs.html", assigns %> <%= render BlockScoutWeb.AddressView, "_tabs.html", assigns %>
<div class="card-body"> <div class="card-body">
<%= if match?({:selfdestructed, _}, contract_creation_code) do %>
<div class="button button-disabled button-sm float-right ml-3">
<%= gettext("Verify & Publish") %>
</div>
<% else %>
<%= if !BlockScoutWeb.AddressView.smart_contract_verified?(@address) do %> <%= if !BlockScoutWeb.AddressView.smart_contract_verified?(@address) do %>
<%= link( <%= link(
gettext("Verify & Publish"), gettext("Verify & Publish"),
@ -12,7 +19,7 @@
"data-test": "verify_and_publish" "data-test": "verify_and_publish"
) %> ) %>
<% end %> <% end %>
<% end %>
<%= if BlockScoutWeb.AddressView.smart_contract_verified?(@address) do %> <%= if BlockScoutWeb.AddressView.smart_contract_verified?(@address) do %>
<div class="mb-4"> <div class="mb-4">
<dl class="row"> <dl class="row">
@ -56,15 +63,32 @@
<% end %> <% end %>
<section> <section>
<%= case contract_creation_code do %>
<% {:selfdestructed, transaction_init} -> %>
<div class="d-flex justify-content-between align-items-baseline"> <div class="d-flex justify-content-between align-items-baseline">
<h3><%= gettext "Contract creation code" %></h3> <h3><%= gettext "Contract Creation Code" %></h3>
<button type="button" class="button button-secondary button-sm" id="button" data-clipboard-text="<%= @address.contract_code %>" aria-label="copy contract creation code"> <button type="button" class="button button-secondary button-sm" id="button" data-clipboard-text="<%= transaction_init %>" aria-label="copy contract creation code">
<%= gettext "Copy Contract Creation Code" %> <%= gettext "Copy Contract Creation Code" %>
</button> </button>
</div> </div>
<div class="alert alert-info">
<p><%= gettext "Contracts that self destruct in their constructors have no contract code published and cannot be verified." %></p>
<p><%= gettext "Displaying the init data provided of the creating transaction." %></p>
</div>
<div class="tile tile-muted"> <div class="tile tile-muted">
<pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= @address.contract_code %></code></pre> <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= transaction_init %></code></pre>
</div> </div>
<% {:ok, contract_code} -> %>
<div class="d-flex justify-content-between align-items-baseline">
<h3><%= gettext "Contract Byte Code" %></h3>
<button type="button" class="button button-secondary button-sm" id="button" data-clipboard-text="<%= contract_code %>" aria-label="copy contract creation code">
<%= gettext "Copy Contract Byte Code" %>
</button>
</div>
<div class="tile tile-muted">
<pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= contract_code %></code></pre>
</div>
<% end %>
</section> </section>
</div> </div>

13
apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
Unescape View File

@ -1,6 +1,8 @@
defmodule BlockScoutWeb.AddressContractView do defmodule BlockScoutWeb.AddressContractView do
use BlockScoutWeb, :view use BlockScoutWeb, :view
alias Explorer.Chain.{Address, Data, InternalTransaction}
def render("scripts.html", %{conn: conn}) do def render("scripts.html", %{conn: conn}) do
render_scripts(conn, "address_contract/code_highlighting.js") render_scripts(conn, "address_contract/code_highlighting.js")
end end
@ -34,4 +36,15 @@ defmodule BlockScoutWeb.AddressContractView do
{value, String.pad_leading(to_string(line), max_digits, " ")} {value, String.pad_leading(to_string(line), max_digits, " ")}
end) end)
end end
def contract_creation_code(%Address{
contract_code: %Data{bytes: <<>>},
contracts_creation_internal_transaction: %InternalTransaction{init: init}
}) do
{:selfdestructed, init}
end
def contract_creation_code(%Address{contract_code: contract_code}) do
{:ok, contract_code}
end
end end

53
apps/block_scout_web/priv/gettext/default.pot
Unescape View File

@ -228,7 +228,7 @@ msgid "Compiler"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:23 #: lib/block_scout_web/templates/address_contract/index.html.eex:30
msgid "Compiler version" msgid "Compiler version"
msgstr "" msgstr ""
@ -256,7 +256,7 @@ msgid "Connection Lost, click to load newer validations"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:46 #: lib/block_scout_web/templates/address_contract/index.html.eex:53
msgid "Contract ABI" msgid "Contract ABI"
msgstr "" msgstr ""
@ -289,17 +289,12 @@ msgid "Contract Name"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:60 #: lib/block_scout_web/templates/address_contract/index.html.eex:26
msgid "Contract creation code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:19
msgid "Contract name:" msgid "Contract name:"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:34 #: lib/block_scout_web/templates/address_contract/index.html.eex:41
msgid "Contract source code" msgid "Contract source code"
msgstr "" msgstr ""
@ -621,7 +616,7 @@ msgid "Older"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:27 #: lib/block_scout_web/templates/address_contract/index.html.eex:34
msgid "Optimization enabled" msgid "Optimization enabled"
msgstr "" msgstr ""
@ -982,7 +977,8 @@ msgid "Value"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:9 #: lib/block_scout_web/templates/address_contract/index.html.eex:11
#: lib/block_scout_web/templates/address_contract/index.html.eex:16
msgid "Verify & Publish" msgid "Verify & Publish"
msgstr "" msgstr ""
@ -1047,7 +1043,7 @@ msgid "at"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/views/address_contract_view.ex:20 #: lib/block_scout_web/views/address_contract_view.ex:22
msgid "false" msgid "false"
msgstr "" msgstr ""
@ -1065,7 +1061,7 @@ msgid "string"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/views/address_contract_view.ex:19 #: lib/block_scout_web/views/address_contract_view.ex:21
msgid "true" msgid "true"
msgstr "" msgstr ""
@ -1509,17 +1505,17 @@ msgid "Support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:48 #: lib/block_scout_web/templates/address_contract/index.html.eex:55
msgid "Copy ABI" msgid "Copy ABI"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:62 #: lib/block_scout_web/templates/address_contract/index.html.eex:71
msgid "Copy Contract Creation Code" msgid "Copy Contract Creation Code"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:36 #: lib/block_scout_web/templates/address_contract/index.html.eex:43
msgid "Copy Source Code" msgid "Copy Source Code"
msgstr "" msgstr ""
@ -1745,3 +1741,28 @@ msgstr ""
#: lib/block_scout_web/templates/common_components/_pagination_container.html.eex:37 #: lib/block_scout_web/templates/common_components/_pagination_container.html.eex:37
msgid "of" msgid "of"
msgstr "" msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:83
msgid "Contract Byte Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:69
msgid "Contract Creation Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:75
msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:85
msgid "Copy Contract Byte Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:76
msgid "Displaying the init data provided of the creating transaction."
msgstr ""

57
apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
Unescape View File

@ -228,7 +228,7 @@ msgid "Compiler"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:23 #: lib/block_scout_web/templates/address_contract/index.html.eex:30
msgid "Compiler version" msgid "Compiler version"
msgstr "" msgstr ""
@ -256,7 +256,7 @@ msgid "Connection Lost, click to load newer validations"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:46 #: lib/block_scout_web/templates/address_contract/index.html.eex:53
msgid "Contract ABI" msgid "Contract ABI"
msgstr "" msgstr ""
@ -289,17 +289,12 @@ msgid "Contract Name"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:60 #: lib/block_scout_web/templates/address_contract/index.html.eex:26
msgid "Contract creation code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:19
msgid "Contract name:" msgid "Contract name:"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:34 #: lib/block_scout_web/templates/address_contract/index.html.eex:41
msgid "Contract source code" msgid "Contract source code"
msgstr "" msgstr ""
@ -621,7 +616,7 @@ msgid "Older"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:27 #: lib/block_scout_web/templates/address_contract/index.html.eex:34
msgid "Optimization enabled" msgid "Optimization enabled"
msgstr "" msgstr ""
@ -982,7 +977,8 @@ msgid "Value"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:9 #: lib/block_scout_web/templates/address_contract/index.html.eex:11
#: lib/block_scout_web/templates/address_contract/index.html.eex:16
msgid "Verify & Publish" msgid "Verify & Publish"
msgstr "" msgstr ""
@ -1047,7 +1043,7 @@ msgid "at"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/views/address_contract_view.ex:20 #: lib/block_scout_web/views/address_contract_view.ex:22
msgid "false" msgid "false"
msgstr "" msgstr ""
@ -1065,7 +1061,7 @@ msgid "string"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/views/address_contract_view.ex:19 #: lib/block_scout_web/views/address_contract_view.ex:21
msgid "true" msgid "true"
msgstr "" msgstr ""
@ -1357,7 +1353,7 @@ msgid "Loading balances"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_coin_balance/index.html.eex:23 #: lib/block_scout_web/templates/address_coin_balance/index.html.eex:22
#: lib/block_scout_web/templates/chain/show.html.eex:13 #: lib/block_scout_web/templates/chain/show.html.eex:13
msgid "Loading chart" msgid "Loading chart"
msgstr "" msgstr ""
@ -1368,7 +1364,7 @@ msgid "There is no coin history for this address."
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_coin_balance/index.html.eex:26 #: lib/block_scout_web/templates/address_coin_balance/index.html.eex:25
#: lib/block_scout_web/templates/chain/show.html.eex:16 #: lib/block_scout_web/templates/chain/show.html.eex:16
msgid "There was a problem loading the chart." msgid "There was a problem loading the chart."
msgstr "" msgstr ""
@ -1509,17 +1505,17 @@ msgid "Support"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:48 #: lib/block_scout_web/templates/address_contract/index.html.eex:55
msgid "Copy ABI" msgid "Copy ABI"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:62 #: lib/block_scout_web/templates/address_contract/index.html.eex:71
msgid "Copy Contract Creation Code" msgid "Copy Contract Creation Code"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:36 #: lib/block_scout_web/templates/address_contract/index.html.eex:43
msgid "Copy Source Code" msgid "Copy Source Code"
msgstr "" msgstr ""
@ -1745,3 +1741,28 @@ msgstr ""
#: lib/block_scout_web/templates/common_components/_pagination_container.html.eex:37 #: lib/block_scout_web/templates/common_components/_pagination_container.html.eex:37
msgid "of" msgid "of"
msgstr "" msgstr ""
#, elixir-format, fuzzy
#: lib/block_scout_web/templates/address_contract/index.html.eex:83
msgid "Contract Byte Code"
msgstr ""
#, elixir-format, fuzzy
#: lib/block_scout_web/templates/address_contract/index.html.eex:69
msgid "Contract Creation Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:75
msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
msgstr ""
#, elixir-format, fuzzy
#: lib/block_scout_web/templates/address_contract/index.html.eex:85
msgid "Copy Contract Byte Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:76
msgid "Displaying the init data provided of the creating transaction."
msgstr ""

2
apps/explorer/lib/explorer/chain/internal_transaction/result.ex
Unescape View File

@ -19,7 +19,7 @@ defmodule Explorer.Chain.InternalTransaction.Result do
{key, to_string(hash)} {key, to_string(hash)}
end end
defp entry_to_raw({"code", _} = entry), do: entry defp entry_to_raw({"code", code}), do: {"code", Data.to_string(code)}
defp entry_to_raw({key, decimal}) when key in ~w(gasUsed) do defp entry_to_raw({key, decimal}) when key in ~w(gasUsed) do
integer = integer =

4
apps/explorer/test/explorer/chain/internal_transaction_test.exs
Unescape View File

@ -1,7 +1,7 @@
defmodule Explorer.Chain.InternalTransactionTest do defmodule Explorer.Chain.InternalTransactionTest do
use Explorer.DataCase use Explorer.DataCase
alias Explorer.Chain.{InternalTransaction, Wei} alias Explorer.Chain.{Data, InternalTransaction, Wei}
alias Explorer.Factory alias Explorer.Factory
import EthereumJSONRPC, only: [integer_to_quantity: 1] import EthereumJSONRPC, only: [integer_to_quantity: 1]
@ -173,7 +173,7 @@ defmodule Explorer.Chain.InternalTransactionTest do
end end
test "it correctly formats a create" do test "it correctly formats a create" do
contract_code = Factory.contract_code_info().bytecode {:ok, contract_code} = Data.cast(Factory.contract_code_info().bytecode)
contract_address = Factory.address_hash() contract_address = Factory.address_hash()
from = Factory.address_hash() from = Factory.address_hash()
gas = 50_000 gas = 50_000

Write Preview
Loading…
Cancel
Save