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

fix: import clique genesis blocks

Browse Source 
Additionally resolves a few small issues that arose in doing so
pull/1409/head
zachdaniel 6 years ago
parent ebf4bf48b2
commit 949a971c25
9 changed files with 83 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. 26
      apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
  2. 29
      apps/block_scout_web/priv/gettext/default.pot
  3. 31
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
  4. 26
      apps/indexer/config/config.exs
  5. 4
      apps/indexer/lib/indexer/block/realtime/fetcher.ex
  6. 3
      apps/indexer/lib/indexer/block/reward/fetcher.ex
  7. 10
      apps/indexer/lib/indexer/block/transform.ex
  8. 2
      apps/indexer/lib/indexer/block/transform/clique.ex
  9. 6
      apps/indexer/test/indexer/block/transform_test.exs

26
apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex
Unescape View File

@ -10,7 +10,7 @@
<!-- Block Height -->
<h3 data-test="block_detail_number">
<%= if block_type(@block) == "Block" do %>
<%= gettext("Block Height: %{height}", height: @block.number) %>
<%= gettext("Block Height: %{height}", height: @block.number) %> <%= if @block.number == 0, do: "- " <> gettext("Genesis Block")%>
<% else %>
<%= gettext("%{block_type} Height:", block_type: block_type(@block)) %>
<%= link(@block, to: block_path(BlockScoutWeb.Endpoint, :show, @block.number)) %>
@ -37,17 +37,19 @@
<dd class="col-sm-9"> <%= to_string(@block.hash) %> </dd>
</dl>
<!-- Parent Hash -->
<dl class="row">
<dt class="col-sm-3 text-muted"> <%= gettext "Parent Hash" %> </dt>
<dd class="col-sm-9">
<%= link(
@block.parent_hash,
class: "block__link",
to: block_path(@conn, :show, @block.number - 1)
) %>
</dd>
</dl>
<%= unless @block.number == 0 do %>
<!-- Parent Hash -->
<dl class="row">
<dt class="col-sm-3 text-muted"> <%= gettext "Parent Hash" %> </dt>
<dd class="col-sm-9">
<%= link(
@block.parent_hash,
class: "block__link",
to: block_path(@conn, :show, @block.number - 1)
) %>
</dd>
</dl>
<% end %>
<!-- Difficulty value -->
<dl class="row">

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

@ -357,7 +357,7 @@ msgid "Details"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:54
#: lib/block_scout_web/templates/block/overview.html.eex:56
msgid "Difficulty"
msgstr ""
@ -437,15 +437,15 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:57
#: lib/block_scout_web/templates/block/overview.html.eex:102
#: lib/block_scout_web/templates/block/overview.html.eex:157
#: lib/block_scout_web/templates/block/overview.html.eex:104
#: lib/block_scout_web/templates/block/overview.html.eex:159
msgid "Gas Limit"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:62
#: lib/block_scout_web/templates/block/overview.html.eex:94
#: lib/block_scout_web/templates/block/overview.html.eex:148
#: lib/block_scout_web/templates/block/overview.html.eex:96
#: lib/block_scout_web/templates/block/overview.html.eex:150
msgid "Gas Used"
msgstr ""
@ -539,7 +539,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:37
#: lib/block_scout_web/templates/block/overview.html.eex:117
#: lib/block_scout_web/templates/block/overview.html.eex:119
#: lib/block_scout_web/templates/chain/_block.html.eex:14
msgid "Miner"
msgstr ""
@ -608,7 +608,7 @@ msgid "No"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:69
#: lib/block_scout_web/templates/block/overview.html.eex:71
#: lib/block_scout_web/templates/transaction/overview.html.eex:67
msgid "Nonce"
msgstr ""
@ -655,7 +655,7 @@ msgid "Parameters"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:42
#: lib/block_scout_web/templates/block/overview.html.eex:43
msgid "Parent Hash"
msgstr ""
@ -674,7 +674,7 @@ msgid "Pending Transactions"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:80
#: lib/block_scout_web/templates/block/overview.html.eex:82
msgid "Position %{index}"
msgstr ""
@ -917,7 +917,7 @@ msgid "Topics"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:63
#: lib/block_scout_web/templates/block/overview.html.eex:65
msgid "Total Difficulty"
msgstr ""
@ -989,7 +989,7 @@ msgid "Twitter"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:76
#: lib/block_scout_web/templates/block/overview.html.eex:78
#: lib/block_scout_web/templates/layout/_topnav.html.eex:23
msgid "Uncles"
msgstr ""
@ -1475,7 +1475,7 @@ msgid "Validator Info"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:137
#: lib/block_scout_web/templates/block/overview.html.eex:139
msgid "Block Rewards"
msgstr ""
@ -1563,3 +1563,8 @@ msgstr ""
#: lib/block_scout_web/templates/address_contract/index.html.eex:39
msgid "Copy Source Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:13
msgid "Genesis Block"
msgstr ""

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

@ -357,7 +357,7 @@ msgid "Details"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:54
#: lib/block_scout_web/templates/block/overview.html.eex:56
msgid "Difficulty"
msgstr ""
@ -437,15 +437,15 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:57
#: lib/block_scout_web/templates/block/overview.html.eex:102
#: lib/block_scout_web/templates/block/overview.html.eex:157
#: lib/block_scout_web/templates/block/overview.html.eex:104
#: lib/block_scout_web/templates/block/overview.html.eex:159
msgid "Gas Limit"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:62
#: lib/block_scout_web/templates/block/overview.html.eex:94
#: lib/block_scout_web/templates/block/overview.html.eex:148
#: lib/block_scout_web/templates/block/overview.html.eex:96
#: lib/block_scout_web/templates/block/overview.html.eex:150
msgid "Gas Used"
msgstr ""
@ -539,7 +539,7 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/_tile.html.eex:37
#: lib/block_scout_web/templates/block/overview.html.eex:117
#: lib/block_scout_web/templates/block/overview.html.eex:119
#: lib/block_scout_web/templates/chain/_block.html.eex:14
msgid "Miner"
msgstr ""
@ -608,7 +608,7 @@ msgid "No"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:69
#: lib/block_scout_web/templates/block/overview.html.eex:71
#: lib/block_scout_web/templates/transaction/overview.html.eex:67
msgid "Nonce"
msgstr ""
@ -655,7 +655,7 @@ msgid "Parameters"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:42
#: lib/block_scout_web/templates/block/overview.html.eex:43
msgid "Parent Hash"
msgstr ""
@ -674,7 +674,7 @@ msgid "Pending Transactions"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:80
#: lib/block_scout_web/templates/block/overview.html.eex:82
msgid "Position %{index}"
msgstr ""
@ -917,7 +917,7 @@ msgid "Topics"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:63
#: lib/block_scout_web/templates/block/overview.html.eex:65
msgid "Total Difficulty"
msgstr ""
@ -989,7 +989,7 @@ msgid "Twitter"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:76
#: lib/block_scout_web/templates/block/overview.html.eex:78
#: lib/block_scout_web/templates/layout/_topnav.html.eex:23
msgid "Uncles"
msgstr ""
@ -1475,7 +1475,7 @@ msgid "Validator Info"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:137
#: lib/block_scout_web/templates/block/overview.html.eex:139
msgid "Block Rewards"
msgstr ""
@ -1554,7 +1554,7 @@ msgstr ""
msgid "Copy ABI"
msgstr ""
#, elixir-format, fuzzy
#, elixir-format
#: lib/block_scout_web/templates/address_contract/index.html.eex:65
msgid "Copy Contract Creation Code"
msgstr ""
@ -1563,3 +1563,8 @@ msgstr ""
#: lib/block_scout_web/templates/address_contract/index.html.eex:39
msgid "Copy Source Code"
msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/block/overview.html.eex:13
msgid "Genesis Block"
msgstr ""

26
apps/indexer/config/config.exs
Unescape View File

@ -4,8 +4,32 @@ use Mix.Config
import Bitwise
block_transformers = %{
"clique" => Indexer.Block.Transform.Clique,
"base" => Indexer.Block.Transform.Base
}
# Compile time environment variable access requires recompilation.
configured_transformer = System.get_env("BLOCK_TRANSFORMER") || "base"
block_transformer =
case Map.get(block_transformers, configured_transformer) do
nil ->
raise """
No such block transformer: #{configured_transformer}.
Valid values are:
#{Enum.join(Map.keys(block_transformers), "\n")}
Please update environment variable BLOCK_TRANSFORMER accordingly.
"""
transformer ->
transformer
end
config :indexer,
block_transformer: Indexer.Block.Transform.Base,
block_transformer: block_transformer,
ecto_repos: [Explorer.Repo],
metadata_updater_days_interval: 7,
# bytes

4
apps/indexer/lib/indexer/block/realtime/fetcher.ex
Unescape View File

@ -220,6 +220,10 @@ defmodule Indexer.Block.Realtime.Fetcher do
defp determine_start_at(number, nil, nil), do: number
defp determine_start_at(number, nil, max_number_seen) do
determine_start_at(number, number - 1, max_number_seen)
end
defp determine_start_at(number, previous_number, max_number_seen) do
if reorg?(number, max_number_seen) do
# set start_at to NOT fill in skipped numbers

3
apps/indexer/lib/indexer/block/reward/fetcher.ex
Unescape View File

@ -88,6 +88,9 @@ defmodule Indexer.Block.Reward.Fetcher do
{:ok, fetched_beneficiaries} ->
run_fetched_beneficiaries(fetched_beneficiaries, hash_string_by_number)
:ignore ->
:ok
{:error, reason} ->
Logger.error(
fn ->

10
apps/indexer/lib/indexer/block/transform.ex
Unescape View File

@ -16,16 +16,6 @@ defmodule Indexer.Block.Transform do
def transform_blocks(blocks) when is_list(blocks) do
transformer = Application.get_env(:indexer, :block_transformer)
unless transformer do
raise ArgumentError,
"""
No block transformer defined. Set a blocker transformer."
config :indexer,
block_transformer: Indexer.Block.Transform.Base
"""
end
Enum.map(blocks, &transformer.transform/1)
end
end

2
apps/indexer/lib/indexer/block/transform/clique.ex
Unescape View File

@ -8,6 +8,8 @@ defmodule Indexer.Block.Transform.Clique do
@behaviour Transform
@impl Transform
def transform(%{number: 0} = block), do: block
def transform(block) when is_map(block) do
miner_address = Util.signer(block)

6
apps/indexer/test/indexer/block/transform_test.exs
Unescape View File

@ -46,11 +46,5 @@ defmodule Indexer.Block.TransformTest do
test "transforms a list of blocks" do
assert Transform.transform_blocks(@blocks)
end
test "raises when no transformer is configured" do
Application.put_env(:indexer, :block_transformer, nil)
assert_raise ArgumentError, fn -> Transform.transform_blocks(@blocks) end
end
end
end

Write Preview
Loading…
Cancel
Save