From 3f571aa4bb7d15045f633afeaf244981b3bbe4cb Mon Sep 17 00:00:00 2001 From: Stamates Date: Tue, 28 Aug 2018 11:04:47 -0400 Subject: [PATCH 01/21] Live updates for internal_transactions on address page Co-authored-by: Tim Mecklem --- .../assets/js/pages/address.js | 51 ++++++++++++-- .../channels/address_channel.ex | 25 ++++++- .../lib/block_scout_web/event_handler.ex | 1 + .../lib/block_scout_web/notifier.ex | 24 ++++++- .../index.html.eex | 10 +-- .../channels/address_channel_test.exs | 70 +++++++++++++++++++ .../features/pages/address_page.ex | 4 ++ .../features/viewing_addresses_test.exs | 23 +++++- apps/explorer/lib/explorer/chain.ex | 5 +- apps/explorer/lib/explorer/chain/import.ex | 9 +-- .../test/explorer/chain/import_test.exs | 7 ++ 11 files changed, 207 insertions(+), 22 deletions(-) diff --git a/apps/block_scout_web/assets/js/pages/address.js b/apps/block_scout_web/assets/js/pages/address.js index dd8116be1e..d450a2c138 100644 --- a/apps/block_scout_web/assets/js/pages/address.js +++ b/apps/block_scout_web/assets/js/pages/address.js @@ -14,6 +14,7 @@ export const initialState = { beyondPageOne: null, channelDisconnected: false, filter: null, + newInternalTransactions: [], newTransactions: [], balance: null, transactionCount: null @@ -42,6 +43,29 @@ export function reducer (state = initialState, action) { balance: action.msg.balance }) } + case 'RECEIVED_NEW_INTERNAL_TRANSACTION_BATCH': { + if (state.channelDisconnected || state.beyondPageOne) return state + + const incomingInternalTransactions = humps.camelizeKeys(action.msgs) + .filter(({toAddressHash, fromAddressHash}) => ( + !state.filter || + (state.filter === 'to' && toAddressHash === state.addressHash) || + (state.filter === 'from' && fromAddressHash === state.addressHash) + )) + + if (!state.batchCountAccumulator && action.msgs.length < BATCH_THRESHOLD) { + return Object.assign({}, state, { + newInternalTransactions: [ + ...state.newInternalTransactions, + ...incomingInternalTransactions.map(({internalTransactionHtml}) => internalTransactionHtml) + ] + }) + } else { + return Object.assign({}, state, { + batchCountAccumulator: state.batchCountAccumulator + action.msgs.length + }) + } + } case 'RECEIVED_NEW_TRANSACTION_BATCH': { if (state.channelDisconnected || state.beyondPageOne) return state @@ -75,26 +99,38 @@ export function reducer (state = initialState, action) { router.when('/address/:addressHash').then((params) => initRedux(reducer, { main (store) { const { addressHash, blockNumber } = params - const channel = socket.channel(`addresses:${addressHash}`, {}) + const addressChannel = socket.channel(`addresses:${addressHash}`, {}) store.dispatch({ type: 'PAGE_LOAD', params, transactionCount: $('[data-selector="transaction-count"]').text() }) - channel.join() - channel.onError(() => store.dispatch({ type: 'CHANNEL_DISCONNECTED' })) - channel.on('balance', (msg) => store.dispatch({ type: 'RECEIVED_UPDATED_BALANCE', msg })) - if (!blockNumber) channel.on('transaction', batchChannel((msgs) => store.dispatch({ type: 'RECEIVED_NEW_TRANSACTION_BATCH', msgs }))) + addressChannel.join() + addressChannel.onError(() => store.dispatch({ type: 'CHANNEL_DISCONNECTED' })) + addressChannel.on('balance', (msg) => store.dispatch({ type: 'RECEIVED_UPDATED_BALANCE', msg })) + if (!blockNumber) { + addressChannel.on('transaction', batchChannel((msgs) => + store.dispatch({ type: 'RECEIVED_NEW_TRANSACTION_BATCH', msgs }) + )) + } + if (!blockNumber) { + addressChannel.on('internal_transaction', batchChannel((msgs) => + store.dispatch({ type: 'RECEIVED_NEW_INTERNAL_TRANSACTION_BATCH', msgs }) + )) + } }, render (state, oldState) { + const $balance = $('[data-selector="balance-card"]') const $channelBatching = $('[data-selector="channel-batching-message"]') const $channelBatchingCount = $('[data-selector="channel-batching-count"]') const $channelDisconnected = $('[data-selector="channel-disconnected-message"]') + const $emptyInternalTransactionsList = $('[data-selector="empty-internal-transactions-list"]') const $emptyTransactionsList = $('[data-selector="empty-transactions-list"]') - const $balance = $('[data-selector="balance-card"]') + const $internalTransactionsList = $('[data-selector="internal-transactions-list"]') const $transactionCount = $('[data-selector="transaction-count"]') const $transactionsList = $('[data-selector="transactions-list"]') + if ($emptyInternalTransactionsList.length && state.newInternalTransactions.length) window.location.reload() if ($emptyTransactionsList.length && state.newTransactions.length) window.location.reload() if (state.channelDisconnected) $channelDisconnected.show() if (oldState.balance !== state.balance) $balance.empty().append(state.balance) @@ -105,6 +141,9 @@ router.when('/address/:addressHash').then((params) => initRedux(reducer, { } else { $channelBatching.hide() } + if (oldState.newInternalTransactions !== state.newInternalTransactions && $internalTransactionsList.length) { + $internalTransactionsList.prepend(state.newInternalTransactions.slice(oldState.newInternalTransactions.length).reverse().join('')) + } if (oldState.newTransactions !== state.newTransactions && $transactionsList.length) { $transactionsList.prepend(state.newTransactions.slice(oldState.newTransactions.length).reverse().join('')) updateAllAges() diff --git a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex index 4a177eee86..dede06f58a 100644 --- a/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex +++ b/apps/block_scout_web/lib/block_scout_web/channels/address_channel.ex @@ -4,10 +4,10 @@ defmodule BlockScoutWeb.AddressChannel do """ use BlockScoutWeb, :channel - alias BlockScoutWeb.{AddressTransactionView, AddressView} + alias BlockScoutWeb.{AddressInternalTransactionView, AddressTransactionView, AddressView} alias Phoenix.View - intercept(["balance_update", "count", "transaction"]) + intercept(["balance_update", "count", "internal_transaction", "transaction"]) def join("addresses:" <> _address_hash, _params, socket) do {:ok, %{}, socket} @@ -40,6 +40,27 @@ defmodule BlockScoutWeb.AddressChannel do {:noreply, socket} end + def handle_out("internal_transaction", %{address: address, internal_transaction: internal_transaction}, socket) do + Gettext.put_locale(BlockScoutWeb.Gettext, socket.assigns.locale) + + rendered_internal_transaction = + View.render_to_string( + AddressInternalTransactionView, + "_internal_transaction.html", + locale: socket.assigns.locale, + address: address, + internal_transaction: internal_transaction + ) + + push(socket, "internal_transaction", %{ + to_address_hash: to_string(internal_transaction.to_address_hash), + from_address_hash: to_string(internal_transaction.from_address_hash), + internal_transaction_html: rendered_internal_transaction + }) + + {:noreply, socket} + end + def handle_out("transaction", %{address: address, transaction: transaction}, socket) do Gettext.put_locale(BlockScoutWeb.Gettext, socket.assigns.locale) diff --git a/apps/block_scout_web/lib/block_scout_web/event_handler.ex b/apps/block_scout_web/lib/block_scout_web/event_handler.ex index a66107d656..5b7bf51118 100644 --- a/apps/block_scout_web/lib/block_scout_web/event_handler.ex +++ b/apps/block_scout_web/lib/block_scout_web/event_handler.ex @@ -19,6 +19,7 @@ defmodule BlockScoutWeb.EventHandler do Chain.subscribe_to_events(:addresses) Chain.subscribe_to_events(:blocks) Chain.subscribe_to_events(:exchange_rate) + Chain.subscribe_to_events(:internal_transactions) Chain.subscribe_to_events(:transactions) {:ok, []} end diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex index 2546a352dc..536c35cae6 100644 --- a/apps/block_scout_web/lib/block_scout_web/notifier.ex +++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex @@ -36,6 +36,10 @@ defmodule BlockScoutWeb.Notifier do }) end + def handle_event({:chain_event, :internal_transactions, internal_transactions}) do + Enum.each(internal_transactions, &broadcast_internal_transaction/1) + end + def handle_event({:chain_event, :transactions, transaction_hashes}) do transaction_hashes |> Chain.hashes_to_transactions( @@ -65,6 +69,24 @@ defmodule BlockScoutWeb.Notifier do }) end + defp broadcast_internal_transaction(internal_transaction) do + Endpoint.broadcast("internal_transactions:new_internal_transaction", "new_internal_transaction", %{ + internal_transaction: internal_transaction + }) + + Endpoint.broadcast("addresses:#{internal_transaction.from_address_hash}", "internal_transaction", %{ + address: internal_transaction.from_address, + internal_transaction: internal_transaction + }) + + if internal_transaction.to_address_hash != internal_transaction.from_address_hash do + Endpoint.broadcast("addresses:#{internal_transaction.to_address_hash}", "internal_transaction", %{ + address: internal_transaction.to_address, + internal_transaction: internal_transaction + }) + end + end + defp broadcast_transaction(transaction) do Endpoint.broadcast("transactions:new_transaction", "new_transaction", %{ transaction: transaction @@ -75,7 +97,7 @@ defmodule BlockScoutWeb.Notifier do transaction: transaction }) - if transaction.to_address_hash && transaction.to_address_hash != transaction.from_address_hash do + if transaction.to_address_hash != transaction.from_address_hash do Endpoint.broadcast("addresses:#{transaction.to_address_hash}", "transaction", %{ address: transaction.to_address, transaction: transaction diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex index dcade22610..fd9c115b33 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex @@ -116,12 +116,14 @@

<%= gettext "Internal Transactions" %>

<%= if Enum.count(@internal_transactions) > 0 do %> - <%= for internal_transaction <- @internal_transactions do %> - <%= render "_internal_transaction.html", address: @address, internal_transaction: internal_transaction %> - <% end %> + + <%= for internal_transaction <- @internal_transactions do %> + <%= render "_internal_transaction.html", address: @address, internal_transaction: internal_transaction %> + <% end %> + <% else %>
- <%= gettext "There are no internal transactions for this address." %> + <%= gettext "There are no internal transactions for this address." %>
<% end %>
diff --git a/apps/block_scout_web/test/block_scout_web/channels/address_channel_test.exs b/apps/block_scout_web/test/block_scout_web/channels/address_channel_test.exs index b4c43f0899..8f8b6da85a 100644 --- a/apps/block_scout_web/test/block_scout_web/channels/address_channel_test.exs +++ b/apps/block_scout_web/test/block_scout_web/channels/address_channel_test.exs @@ -110,5 +110,75 @@ defmodule BlockScoutWeb.AddressChannelTest do 100 -> assert true end end + + test "notified of new_internal_transaction for matching from_address", %{address: address, topic: topic} do + transaction = + :transaction + |> insert(from_address: address) + |> with_block() + + internal_transaction = insert(:internal_transaction, transaction: transaction, from_address: address, index: 0) + + Notifier.handle_event({:chain_event, :internal_transactions, [internal_transaction]}) + + receive do + %Phoenix.Socket.Broadcast{topic: ^topic, event: "internal_transaction", payload: payload} -> + assert payload.address.hash == address.hash + assert payload.internal_transaction.id == internal_transaction.id + after + 5_000 -> + assert false, "Expected message received nothing." + end + end + + test "notified of new_internal_transaction for matching to_address", %{address: address, topic: topic} do + transaction = + :transaction + |> insert(to_address: address) + |> with_block() + + internal_transaction = insert(:internal_transaction, transaction: transaction, to_address: address, index: 0) + + Notifier.handle_event({:chain_event, :internal_transactions, [internal_transaction]}) + + receive do + %Phoenix.Socket.Broadcast{topic: ^topic, event: "internal_transaction", payload: payload} -> + assert payload.address.hash == address.hash + assert payload.internal_transaction.id == internal_transaction.id + after + 5_000 -> + assert false, "Expected message received nothing." + end + end + + test "not notified twice of new_internal_transaction if to and from address are equal", %{ + address: address, + topic: topic + } do + transaction = + :transaction + |> insert(from_address: address, to_address: address) + |> with_block() + + internal_transaction = + insert(:internal_transaction, transaction: transaction, from_address: address, to_address: address, index: 0) + + Notifier.handle_event({:chain_event, :internal_transactions, [internal_transaction]}) + + receive do + %Phoenix.Socket.Broadcast{topic: ^topic, event: "internal_transaction", payload: payload} -> + assert payload.address.hash == address.hash + assert payload.internal_transaction.id == internal_transaction.id + after + 5_000 -> + assert false, "Expected message received nothing." + end + + receive do + _ -> assert false, "Received duplicate broadcast." + after + 100 -> assert true + end + end end end diff --git a/apps/block_scout_web/test/block_scout_web/features/pages/address_page.ex b/apps/block_scout_web/test/block_scout_web/features/pages/address_page.ex index 601e5c148a..d64bbd8d78 100644 --- a/apps/block_scout_web/test/block_scout_web/features/pages/address_page.ex +++ b/apps/block_scout_web/test/block_scout_web/features/pages/address_page.ex @@ -31,6 +31,10 @@ defmodule BlockScoutWeb.AddressPage do css("[data-test='address_detail_hash']", text: to_string(address_hash)) end + def internal_transaction(%InternalTransaction{id: id}) do + css("[data-test='internal_transaction'][data-internal-transaction-id='#{id}']") + end + def internal_transactions(count: count) do css("[data-test='internal_transaction']", count: count) end diff --git a/apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs b/apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs index b5ca4a5a3e..0c16ddd2e7 100644 --- a/apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs +++ b/apps/block_scout_web/test/block_scout_web/features/viewing_addresses_test.exs @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.ViewingAddressesTest do alias Explorer.Chain.Wei alias Explorer.Factory - alias BlockScoutWeb.{AddressPage, AddressView} + alias BlockScoutWeb.{AddressPage, AddressView, Notifier} setup do block = insert(:block) @@ -217,6 +217,27 @@ defmodule BlockScoutWeb.ViewingAddressesTest do |> AddressPage.click_internal_transactions() |> assert_has(AddressPage.internal_transaction_address_link(internal_transaction, :from)) end + + test "viewing new internal transactions via live update", %{addresses: addresses, session: session} do + transaction = + :transaction + |> insert(from_address: addresses.lincoln) + |> with_block() + + session + |> AddressPage.visit_page(addresses.lincoln) + |> AddressPage.click_internal_transactions() + |> assert_has(AddressPage.internal_transactions(count: 2)) + + internal_transaction = + insert(:internal_transaction, transaction: transaction, index: 0, from_address: addresses.lincoln) + + Notifier.handle_event({:chain_event, :internal_transactions, [internal_transaction]}) + + session + |> assert_has(AddressPage.internal_transactions(count: 3)) + |> assert_has(AddressPage.internal_transaction(internal_transaction)) + end end test "viewing transaction count", %{addresses: addresses, session: session} do diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 63c21a5b2a..2ac103b84b 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -48,7 +48,8 @@ defmodule Explorer.Chain do @typedoc """ Event type where data is broadcasted whenever data is inserted from chain indexing. """ - @type chain_event :: :addresses | :balances | :blocks | :exchange_rate | :logs | :transactions + @type chain_event :: + :addresses | :balances | :blocks | :exchange_rate | :internal_transactions | :logs | :transactions @type direction :: :from | :to @@ -1212,7 +1213,7 @@ defmodule Explorer.Chain do """ @spec subscribe_to_events(chain_event()) :: :ok def subscribe_to_events(event_type) - when event_type in ~w(addresses balances blocks exchange_rate logs transactions)a do + when event_type in ~w(addresses balances blocks exchange_rate internal_transactions logs transactions)a do Registry.register(Registry.ChainEvents, event_type, []) :ok end diff --git a/apps/explorer/lib/explorer/chain/import.ex b/apps/explorer/lib/explorer/chain/import.ex index a09de9aa5b..6f65197fda 100644 --- a/apps/explorer/lib/explorer/chain/import.ex +++ b/apps/explorer/lib/explorer/chain/import.ex @@ -209,7 +209,8 @@ defmodule Explorer.Chain.Import do end defp broadcast_events(data) do - for {event_type, event_data} <- data, event_type in ~w(addresses balances blocks logs transactions)a do + for {event_type, event_data} <- data, + event_type in ~w(addresses balances blocks internal_transactions logs transactions)a do broadcast_event_data(event_type, event_data) end end @@ -671,11 +672,7 @@ defmodule Explorer.Chain.Import do timestamps: timestamps ) - {:ok, - for( - internal_transaction <- internal_transactions, - do: Map.take(internal_transaction, [:index, :transaction_hash]) - )} + {:ok, internal_transactions} end @spec insert_logs([map()], %{required(:timeout) => timeout, required(:timestamps) => timestamps}) :: diff --git a/apps/explorer/test/explorer/chain/import_test.exs b/apps/explorer/test/explorer/chain/import_test.exs index 4440845207..fc42598b63 100644 --- a/apps/explorer/test/explorer/chain/import_test.exs +++ b/apps/explorer/test/explorer/chain/import_test.exs @@ -11,6 +11,7 @@ defmodule Explorer.Chain.ImportTest do Log, Hash, Import, + InternalTransaction, Token, TokenTransfer, Transaction @@ -417,6 +418,12 @@ defmodule Explorer.Chain.ImportTest do assert_received {:chain_event, :blocks, [%Block{}]} end + test "publishes internal_transaction data to subscribers on insert" do + Chain.subscribe_to_events(:internal_transactions) + Import.all(@import_data) + assert_received {:chain_event, :internal_transactions, [%InternalTransaction{}]} + end + test "publishes log data to subscribers on insert" do Chain.subscribe_to_events(:logs) Import.all(@import_data) From 4e05488136214fcb626bda3b624096110a76798e Mon Sep 17 00:00:00 2001 From: Stamates Date: Thu, 30 Aug 2018 16:45:09 -0400 Subject: [PATCH 02/21] Send internal_transaction ids on Pub-Sub and Repo fetch with preloads of internal_transaction in Notifier Co-authored-by: Timothy Mecklem --- apps/block_scout_web/lib/block_scout_web/notifier.ex | 6 ++++-- apps/explorer/lib/explorer/chain/import.ex | 8 ++++++-- apps/explorer/test/explorer/chain/import_test.exs | 3 +-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/notifier.ex b/apps/block_scout_web/lib/block_scout_web/notifier.ex index 536c35cae6..849daaa2c7 100644 --- a/apps/block_scout_web/lib/block_scout_web/notifier.ex +++ b/apps/block_scout_web/lib/block_scout_web/notifier.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.Notifier do """ alias Explorer.{Chain, Market, Repo} - alias Explorer.Chain.Address + alias Explorer.Chain.{Address, InternalTransaction} alias Explorer.ExchangeRates.Token alias BlockScoutWeb.Endpoint @@ -37,7 +37,9 @@ defmodule BlockScoutWeb.Notifier do end def handle_event({:chain_event, :internal_transactions, internal_transactions}) do - Enum.each(internal_transactions, &broadcast_internal_transaction/1) + internal_transactions + |> Stream.map(&(InternalTransaction |> Repo.get(&1.id) |> Repo.preload([:from_address, :to_address]))) + |> Enum.each(&broadcast_internal_transaction/1) end def handle_event({:chain_event, :transactions, transaction_hashes}) do diff --git a/apps/explorer/lib/explorer/chain/import.ex b/apps/explorer/lib/explorer/chain/import.ex index 6f65197fda..1644a088d2 100644 --- a/apps/explorer/lib/explorer/chain/import.ex +++ b/apps/explorer/lib/explorer/chain/import.ex @@ -667,12 +667,16 @@ defmodule Explorer.Chain.Import do conflict_target: [:transaction_hash, :index], for: InternalTransaction, on_conflict: :replace_all, - returning: [:index, :transaction_hash], + returning: [:id, :index, :transaction_hash], timeout: timeout, timestamps: timestamps ) - {:ok, internal_transactions} + {:ok, + for( + internal_transaction <- internal_transactions, + do: Map.take(internal_transaction, [:id, :index, :transaction_hash]) + )} end @spec insert_logs([map()], %{required(:timeout) => timeout, required(:timestamps) => timestamps}) :: diff --git a/apps/explorer/test/explorer/chain/import_test.exs b/apps/explorer/test/explorer/chain/import_test.exs index fc42598b63..7c691c6d59 100644 --- a/apps/explorer/test/explorer/chain/import_test.exs +++ b/apps/explorer/test/explorer/chain/import_test.exs @@ -11,7 +11,6 @@ defmodule Explorer.Chain.ImportTest do Log, Hash, Import, - InternalTransaction, Token, TokenTransfer, Transaction @@ -421,7 +420,7 @@ defmodule Explorer.Chain.ImportTest do test "publishes internal_transaction data to subscribers on insert" do Chain.subscribe_to_events(:internal_transactions) Import.all(@import_data) - assert_received {:chain_event, :internal_transactions, [%InternalTransaction{}]} + assert_received {:chain_event, :internal_transactions, [%{id: _}, %{id: _}]} end test "publishes log data to subscribers on insert" do From 15f566f8b13afb437a2151f6298e9bfb12bbd369 Mon Sep 17 00:00:00 2001 From: Stamates Date: Fri, 31 Aug 2018 09:55:39 -0400 Subject: [PATCH 03/21] Add disconnect and batching messages to internal_transactions live update --- .../address_internal_transaction/index.html.eex | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex index fd9c115b33..35d0c4af3c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex @@ -78,6 +78,16 @@
+
+
+ <%= gettext "More internal transactions have come in" %> +
+
+
+
+ <%= gettext "Connection Lost, click to load newer internal transactions" %> +
+
@@ -90,7 +90,7 @@

Contract ABI

- @@ -110,7 +110,7 @@

Contract creation code

- diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification/new.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification/new.html.eex index c92532b98a..30f484a6cd 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification/new.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract_verification/new.html.eex @@ -53,15 +53,15 @@ name="button" id="loading" disabled="true" - class="d-none px-4 position-absolute button button--primary button--sm mr-2"> + class="d-none px-4 position-absolute button button-primary button-sm mr-2"> <%= gettext("loading.....") %> - <%= submit "Verify and publish", class: "button button--primary button--sm mr-2", "data-loading": "animation" %> - <%= reset "Reset", class: "button button--secondary button--sm mr-2" %> + <%= submit "Verify and publish", class: "button button-primary button-sm mr-2", "data-loading": "animation" %> + <%= reset "Reset", class: "button button-secondary button-sm mr-2" %> <%= link( "Cancel", to: address_contract_path(@conn, :index, @conn.params["address_id"]), - class: "button button--sm") %> + class: "button button-sm") %> <% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex index 35d0c4af3c..3472571c01 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex @@ -89,7 +89,7 @@
- @@ -140,7 +140,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: address_internal_transaction_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex new file mode 100644 index 0000000000..4efafd18ef --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex @@ -0,0 +1,122 @@ +
+ + <%= render BlockScoutWeb.AddressView, "overview.html", assigns %> + +
+
+
+ + +
    +
  • + <%= link( + gettext("Tokens"), + class: "nav-link active", + to: address_token_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> +
    • +
  • + <%= link( + gettext("Transactions"), + class: "nav-link", + to: address_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> +
    • +
  • <%= link( + gettext("Internal Transactions"), + class: "nav-link", + "data-test": "internal_transactions_tab_link", + to: address_internal_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> +
    • + <%= if contract?(@address) do %> +
  • + <%= link( + to: address_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), + class: "nav-link") do %> + <%= gettext("Code") %> + + <%= if smart_contract_verified?(@address) do %> + + <% end %> + <% end %> +
    • + <% end %> + <%= if smart_contract_with_read_only_functions?(@address) do %> +
  • + <%= link( + gettext("Read Contract"), + to: address_read_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), + class: "nav-link")%> +
    • + <% end %> +
+ + +
    +
  • + +
    + <%= link( + gettext("Token"), + class: "dropdown-item", + to: address_token_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> + <%= link( + gettext("Transactions"), + class: "dropdown-item", + to: address_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> + <%= link( + gettext("Internal Transactions"), + class: "dropdown-item", + "data-test": "internal_transactions_tab_link", + to: address_internal_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) + ) %> + <%= if contract?(@address) do %> + <%= link( + to: address_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), + class: "dropdown-item") do %> + <%= gettext("Code") %> + + <%= if smart_contract_verified?(@address) do %> + + <% end %> + <% end %> + <% end %> +
    +
    • +
+
+ +
+

<%= gettext "Tokens" %>

+ <%= if Enum.any?(@tokens) do %> + <%= for token <- @tokens do %> + <%= render "_tokens.html", conn: @conn, locale: @locale, token: token %> + <% end %> + <% else %> +
+ <%= gettext "There are no tokens for this address." %> +
+ <% end %> + +
+ <%= if @next_page_params do %> + <%= link( + gettext("Next"), + class: "button button-secondary button-sm float-right", + to: address_token_path( + @conn, + :index, + @conn.assigns.locale, + @address, + @next_page_params + ) + ) %> + <% end %> +
+
+
+
+
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 39c8a6d1a1..0846f3bda1 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 @@ -90,7 +90,7 @@
- @@ -141,7 +141,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: address_transaction_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_action_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_action_tile.html.eex index 7c2eab9fe9..33844ae5b0 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_action_tile.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_action_tile.html.eex @@ -18,8 +18,8 @@

<%= gettext "Parameters" %> - - + +

@@ -89,10 +89,10 @@ <% end %>
- +
- +
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex index 84d6a73ee4..409be76af5 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex @@ -13,7 +13,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: block_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex index 0ed13933c7..aecf3db532 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex @@ -48,7 +48,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: transaction_path( @conn, :index, 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 20e9840c99..1c171bd7f1 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 @@ -52,7 +52,7 @@
- <%= link(gettext("View All Blocks →"), to: block_path(BlockScoutWeb.Endpoint, :index), class: "button button--secondary button--xsmall float-right") %> + <%= link(gettext("View All Blocks →"), to: block_path(BlockScoutWeb.Endpoint, :index), class: "button button-secondary button-xsmall float-right") %>

<%= gettext "Blocks" %>

<%= for block <- @blocks do %> @@ -69,7 +69,7 @@ <%= gettext "More transactions have come in" %>
- <%= link(gettext("View All Transactions →"), to: transaction_path(BlockScoutWeb.Endpoint, :index), class: "button button--secondary button--xsmall float-right") %> + <%= link(gettext("View All Transactions →"), to: transaction_path(BlockScoutWeb.Endpoint, :index), class: "button button-secondary button-xsmall float-right") %>

<%= gettext "Transactions" %>

<%= for transaction <- @transactions do %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex index b0083781da..9e3991a058 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex @@ -76,7 +76,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: pending_transaction_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex index 5fd9908710..7c94f0bd25 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex @@ -19,7 +19,7 @@
<% end %> - +
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/token/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/token/show.html.eex index 6c5c471ce3..59b1a762ab 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/token/show.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/token/show.html.eex @@ -69,7 +69,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--small float-right mt-4", + class: "button button-secondary button-small float-right mt-4", to: token_path(@conn, :show, @token.contract_address_hash, @next_page_params) ) %> <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex index 6990eeaa63..408418e821 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex @@ -64,7 +64,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: transaction_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex index e11701176c..6ad8b0e0f8 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex @@ -75,7 +75,7 @@ <%= if @next_page_params do %> <%= link( gettext("Newer"), - class: "button button--secondary button--sm float-right mt-3", + class: "button button-secondary button-sm float-right mt-3", to: transaction_internal_transaction_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex index 4de4100181..6745482f5c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex @@ -120,7 +120,7 @@ <%= if @next_page_params do %> <%= link( gettext("Newer"), - class: "button button--secondary button--sm u-float-right mt-3", + class: "button button-secondary button-sm u-float-right mt-3", to: transaction_log_path( @conn, :index, diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex index 145a7ca439..4c4ab372c9 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex @@ -70,7 +70,7 @@ <%= if @next_page_params do %> <%= link( gettext("Older"), - class: "button button--secondary button--sm u-float-left mt-3", + class: "button button-secondary button-sm u-float-left mt-3", to: transaction_token_transfer_path( @conn, :index, From 41761fd029bb1338036481be8f25e01c381fd6f3 Mon Sep 17 00:00:00 2001 From: Ryan Arthur Date: Tue, 4 Sep 2018 14:21:00 -0400 Subject: [PATCH 12/21] Remove address token index template --- .../templates/address_token/index.html.eex | 122 ------------------ 1 file changed, 122 deletions(-) delete mode 100644 apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex deleted file mode 100644 index 4efafd18ef..0000000000 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex +++ /dev/null @@ -1,122 +0,0 @@ -
- - <%= render BlockScoutWeb.AddressView, "overview.html", assigns %> - -
-
-
- - -
    -
  • - <%= link( - gettext("Tokens"), - class: "nav-link active", - to: address_token_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> -
    • -
  • - <%= link( - gettext("Transactions"), - class: "nav-link", - to: address_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> -
    • -
  • <%= link( - gettext("Internal Transactions"), - class: "nav-link", - "data-test": "internal_transactions_tab_link", - to: address_internal_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> -
    • - <%= if contract?(@address) do %> -
  • - <%= link( - to: address_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), - class: "nav-link") do %> - <%= gettext("Code") %> - - <%= if smart_contract_verified?(@address) do %> - - <% end %> - <% end %> -
    • - <% end %> - <%= if smart_contract_with_read_only_functions?(@address) do %> -
  • - <%= link( - gettext("Read Contract"), - to: address_read_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), - class: "nav-link")%> -
    • - <% end %> -
- - -
    -
  • - -
    - <%= link( - gettext("Token"), - class: "dropdown-item", - to: address_token_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> - <%= link( - gettext("Transactions"), - class: "dropdown-item", - to: address_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> - <%= link( - gettext("Internal Transactions"), - class: "dropdown-item", - "data-test": "internal_transactions_tab_link", - to: address_internal_transaction_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]) - ) %> - <%= if contract?(@address) do %> - <%= link( - to: address_contract_path(@conn, :index, @conn.assigns.locale, @conn.params["address_id"]), - class: "dropdown-item") do %> - <%= gettext("Code") %> - - <%= if smart_contract_verified?(@address) do %> - - <% end %> - <% end %> - <% end %> -
    -
    • -
-
- -
-

<%= gettext "Tokens" %>

- <%= if Enum.any?(@tokens) do %> - <%= for token <- @tokens do %> - <%= render "_tokens.html", conn: @conn, locale: @locale, token: token %> - <% end %> - <% else %> -
- <%= gettext "There are no tokens for this address." %> -
- <% end %> - -
- <%= if @next_page_params do %> - <%= link( - gettext("Next"), - class: "button button-secondary button-sm float-right", - to: address_token_path( - @conn, - :index, - @conn.assigns.locale, - @address, - @next_page_params - ) - ) %> - <% end %> -
-
-
-
-
From ac221f9da6d23fab73f41d5db88a27ed39be9f5b Mon Sep 17 00:00:00 2001 From: Ryan Arthur Date: Tue, 4 Sep 2018 14:21:32 -0400 Subject: [PATCH 13/21] Remove commented code --- apps/block_scout_web/assets/css/theme/_base_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/block_scout_web/assets/css/theme/_base_variables.scss b/apps/block_scout_web/assets/css/theme/_base_variables.scss index d92427e068..f733764880 100644 --- a/apps/block_scout_web/assets/css/theme/_base_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_base_variables.scss @@ -31,7 +31,6 @@ $grays: map-merge(( $blue: #4786ff !default; $indigo: #5b33a1 !default; -// $purple: #9987fc !default; $purple: #997fdc !default; $pink: #e83e8c !default; $red: #c74d39 !default; From 82a849fe9ee966ea478df4e03169cbe995b564ab Mon Sep 17 00:00:00 2001 From: katibest Date: Thu, 6 Sep 2018 10:40:46 -0400 Subject: [PATCH 14/21] Updated sokol logo --- apps/block_scout_web/assets/static/images/sokol_logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/static/images/sokol_logo.svg b/apps/block_scout_web/assets/static/images/sokol_logo.svg index 0fd2125b91..6860f22541 100644 --- a/apps/block_scout_web/assets/static/images/sokol_logo.svg +++ b/apps/block_scout_web/assets/static/images/sokol_logo.svg @@ -1 +1 @@ -sokol_logosokol \ No newline at end of file +sokol_logo \ No newline at end of file From 8320dcd270d11248edb6b7f1cbf548b14fb312d4 Mon Sep 17 00:00:00 2001 From: Ryan Arthur Date: Thu, 6 Sep 2018 10:58:18 -0400 Subject: [PATCH 15/21] Fix copy contract source code tooltip text --- .../block_scout_web/templates/address_contract/index.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex index 713d74a0f3..0ab897bccb 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex @@ -72,7 +72,7 @@

Contract source code

- From 3e8ad3a2e9be3dc7ec5c6490d71eb5c50f4dea28 Mon Sep 17 00:00:00 2001 From: Ryan Arthur Date: Thu, 6 Sep 2018 11:07:13 -0400 Subject: [PATCH 16/21] Remove tooltip default text so that it only says 'Copied' when clicked --- .../block_scout_web/templates/address_contract/index.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex index 0ab897bccb..2177b907c9 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex @@ -72,7 +72,7 @@

Contract source code

- From fae245357957e001beb1a8ec671627c1ddc6b68b Mon Sep 17 00:00:00 2001 From: jimmay5469 Date: Mon, 10 Sep 2018 09:54:54 -0400 Subject: [PATCH 17/21] i18n --- apps/block_scout_web/priv/gettext/default.pot | 1 - apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index b050ec65ab..acc18b30d5 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -588,7 +588,6 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 -#: lib/block_scout_web/templates/address_contract/index.html.eex:75 msgid "Copy Address" 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 eb92b7aea7..44704d1d11 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 @@ -600,7 +600,6 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 -#: lib/block_scout_web/templates/address_contract/index.html.eex:75 msgid "Copy Address" msgstr "" From 6338627e79dfcc3a9a289d86376be27bffb18e39 Mon Sep 17 00:00:00 2001 From: katibest Date: Wed, 5 Sep 2018 15:03:37 -0400 Subject: [PATCH 18/21] Updated tile and added type, copy, qr code --- .../tokens/overview/_details.html.eex | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex index bcd3db8463..3fe88659ba 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex @@ -3,6 +3,18 @@
+
+ + + + + + +

<%= if token_name?(@token) do %> <%= @token.name %> @@ -11,9 +23,12 @@ <% end %>

+ +

<%= to_string(@token.contract_address_hash) %>

+ <%= @token.type %> <%= @total_address_in_token_transfers %> <%= gettext "addresses" %> <%= @total_token_transfers %> <%= gettext "Transfers" %> <%= if decimals?(@token) do %> @@ -50,3 +65,22 @@
<% end %>
+ + From dededf586930bc4e6c144ff679e8535297468cf4 Mon Sep 17 00:00:00 2001 From: jimmay5469 Date: Mon, 10 Sep 2018 10:23:06 -0400 Subject: [PATCH 19/21] i18n --- apps/block_scout_web/priv/gettext/default.pot | 14 +++++++++----- .../priv/gettext/en/LC_MESSAGES/default.po | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index acc18b30d5..4cfdc6966c 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -588,6 +588,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:8 msgid "Copy Address" msgstr "" @@ -601,6 +602,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:13 #: lib/block_scout_web/templates/address/overview.html.eex:64 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:13 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:73 msgid "QR Code" msgstr "" @@ -685,6 +688,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:73 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:82 msgid "Close" msgstr "" @@ -727,7 +731,7 @@ msgid "Token Transfer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:18 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:33 msgid "Transfers" msgstr "" @@ -760,7 +764,7 @@ msgid "There are no transfers for this Token." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:10 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:22 msgid "Token Details" msgstr "" @@ -784,17 +788,17 @@ msgid "Token Transfers" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:17 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:32 msgid "addresses" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:20 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:35 msgid "decimals" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:31 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:46 msgid "Total Supply" 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 44704d1d11..bb9c90c23f 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 @@ -600,6 +600,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:8 msgid "Copy Address" msgstr "" @@ -613,6 +614,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:13 #: lib/block_scout_web/templates/address/overview.html.eex:64 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:13 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:73 msgid "QR Code" msgstr "" @@ -697,6 +700,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:73 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:82 msgid "Close" msgstr "" @@ -739,7 +743,7 @@ msgid "Token Transfer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:18 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:33 msgid "Transfers" msgstr "" @@ -772,7 +776,7 @@ msgid "There are no transfers for this Token." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:10 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:22 msgid "Token Details" msgstr "" @@ -796,17 +800,17 @@ msgid "Token Transfers" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:17 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:32 msgid "addresses" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:20 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:35 msgid "decimals" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:31 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:46 msgid "Total Supply" msgstr "" From a07998547f6c8ac3740b42c3d5462a3f251641ee Mon Sep 17 00:00:00 2001 From: Sebastian Abondano Date: Thu, 30 Aug 2018 21:07:46 -0400 Subject: [PATCH 20/21] API account#txlist filterby=from support Why: * For API users to be able to get a list of transactions in which a given address is the 'sender' (address is the 'from' in transaction). Example usage: ``` /api?module=account&action&txlist&address={someAddress}&filterby=from ``` * Issue link: https://github.com/poanetwork/blockscout/issues/635 This change addresses the need by: * Editing `where_address_match/3` in `Explorer.Etherscan` to support `filter_by: "from"` option. * Editing `put_filter_by/2` in `API.RPC.AddressController` to support 'from' as an allowed value of the `filterby` parameter. * Editing API docs page per changes mentioned above. --- .../controllers/api/rpc/address_controller.ex | 2 +- .../lib/block_scout_web/etherscan.ex | 2 +- .../api/rpc/address_controller_test.exs | 73 +++++++++++++++++-- apps/explorer/lib/explorer/etherscan.ex | 4 + .../explorer/test/explorer/etherscan_test.exs | 33 +++++++++ 5 files changed, 107 insertions(+), 7 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex index 8d65c6febe..d9341a7b42 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex @@ -322,7 +322,7 @@ defmodule BlockScoutWeb.API.RPC.AddressController do defp put_filter_by(options, params) do case params do - %{"filterby" => filter_by} when filter_by in ["to"] -> + %{"filterby" => filter_by} when filter_by in ["from", "to"] -> Map.put(options, :filter_by, filter_by) _ -> diff --git a/apps/block_scout_web/lib/block_scout_web/etherscan.ex b/apps/block_scout_web/lib/block_scout_web/etherscan.ex index a09416952f..a73e7866b1 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -661,7 +661,7 @@ defmodule BlockScoutWeb.Etherscan do description: """ A string representing the field to filter by. If none is given it returns transactions that match to, from, or contract address. - Available values: to + Available values: to, from """ } ], diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs index 5b58a65795..1ceb9c1413 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs @@ -985,6 +985,63 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["message"] == "OK" end + test "with filterby=to option", %{conn: conn} do + block = insert(:block) + address = insert(:address) + + insert(:transaction, from_address: address) + |> with_block(block) + + insert(:transaction, to_address: address) + |> with_block(block) + + params = %{ + "module" => "account", + "action" => "txlist", + "address" => "#{address.hash}", + "filterby" => "to" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 1 + assert response["status"] == "1" + assert response["message"] == "OK" + end + + test "with filterby=from option", %{conn: conn} do + block = insert(:block) + address = insert(:address) + + insert(:transaction, from_address: address) + |> with_block(block) + + insert(:transaction, from_address: address) + |> with_block(block) + + insert(:transaction, to_address: address) + |> with_block(block) + + params = %{ + "module" => "account", + "action" => "txlist", + "address" => "#{address.hash}", + "filterby" => "from" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 2 + assert response["status"] == "1" + assert response["message"] == "OK" + end + test "supports GET and POST requests", %{conn: conn} do address = insert(:address) @@ -1706,16 +1763,22 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert AddressController.optional_params(params3) == %{} end - test "'filterby' value can only be 'to'" do + test "'filterby' value can be 'to' or 'from'" do params1 = %{"filterby" => "to"} - optional_params = AddressController.optional_params(params1) + optional_params1 = AddressController.optional_params(params1) - assert optional_params.filter_by == "to" + assert optional_params1.filter_by == "to" + + params2 = %{"filterby" => "from"} - params2 = %{"filterby" => "invalid"} + optional_params2 = AddressController.optional_params(params2) - assert AddressController.optional_params(params2) == %{} + assert optional_params2.filter_by == "from" + + params3 = %{"filterby" => "invalid"} + + assert AddressController.optional_params(params3) == %{} end test "only includes optional params when they're given" do diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index 3f6dd9f6ce..f4b9f646cd 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -226,6 +226,10 @@ defmodule Explorer.Etherscan do where(query, [t], t.to_address_hash == ^address_hash) end + defp where_address_match(query, address_hash, %{filter_by: "from"}) do + where(query, [t], t.from_address_hash == ^address_hash) + end + defp where_address_match(query, address_hash, _) do query |> where([t], t.to_address_hash == ^address_hash) diff --git a/apps/explorer/test/explorer/etherscan_test.exs b/apps/explorer/test/explorer/etherscan_test.exs index 52b60f8870..418c7123ba 100644 --- a/apps/explorer/test/explorer/etherscan_test.exs +++ b/apps/explorer/test/explorer/etherscan_test.exs @@ -379,6 +379,39 @@ defmodule Explorer.EtherscanTest do assert length(found_transactions) == 0 end + + test "with filter_by: 'from' option with one matching transaction" do + address = insert(:address) + + :transaction + |> insert(to_address: address) + |> with_block() + + :transaction + |> insert(from_address: address) + |> with_block() + + options = %{filter_by: "from"} + + found_transactions = Etherscan.list_transactions(address.hash, options) + + assert length(found_transactions) == 1 + end + + test "with filter_by: 'from' option with non-matching transaction" do + address = insert(:address) + other_address = insert(:address) + + :transaction + |> insert(from_address: other_address, to_address: nil) + |> with_block() + + options = %{filter_by: "from"} + + found_transactions = Etherscan.list_transactions(address.hash, options) + + assert length(found_transactions) == 0 + end end describe "list_internal_transactions/1" do From 6148658f61e369ccb58a373a2df5bba143200b44 Mon Sep 17 00:00:00 2001 From: Felipe Renan Date: Thu, 6 Sep 2018 18:48:52 -0300 Subject: [PATCH 21/21] Store tokens with invalid strings in Token indexer. It's a temp fix for https://github.com/poanetwork/blockscout/issues/669. For now, we are going to store those tokens that have names and/or symbols invalids considering: - the first 6 characters from the contract address hash for the name. - nil for the symbol. --- apps/indexer/lib/indexer/token_fetcher.ex | 34 ++++- .../test/indexer/token_fetcher_test.exs | 116 +++++++++++++++++- 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/apps/indexer/lib/indexer/token_fetcher.ex b/apps/indexer/lib/indexer/token_fetcher.ex index a480f79df6..eeef947772 100644 --- a/apps/indexer/lib/indexer/token_fetcher.ex +++ b/apps/indexer/lib/indexer/token_fetcher.ex @@ -4,7 +4,7 @@ defmodule Indexer.TokenFetcher do """ alias Explorer.Chain - alias Explorer.Chain.Token + alias Explorer.Chain.{Hash, Token} alias Explorer.Chain.Hash.Address alias Explorer.SmartContract.Reader alias Indexer.BufferedTask @@ -153,10 +153,42 @@ defmodule Indexer.TokenFetcher do |> Map.from_struct() |> Map.put(:cataloged, true) |> Map.merge(token_contract_data) + |> handle_invalid_strings() end defp atomized_key("decimals"), do: :decimals defp atomized_key("name"), do: :name defp atomized_key("symbol"), do: :symbol defp atomized_key("totalSupply"), do: :total_supply + + # It's a temp fix to store tokens that have names and/or symbols with characters that the database + # doesn't accept. See https://github.com/poanetwork/blockscout/issues/669 for more info. + defp handle_invalid_strings(%{name: name, symbol: symbol, contract_address_hash: contract_address_hash} = token) do + name = handle_invalid_name(name, contract_address_hash) + symbol = handle_invalid_symbol(symbol) + + %{token | name: name, symbol: symbol} + end + + defp handle_invalid_name(nil, _contract_address_hash), do: nil + + defp handle_invalid_name(name, contract_address_hash) do + case String.valid?(name) do + true -> name + false -> format_according_contract_address_hash(contract_address_hash) + end + end + + defp handle_invalid_symbol(symbol) do + case String.valid?(symbol) do + true -> symbol + false -> nil + end + end + + defp format_according_contract_address_hash(contract_address_hash) do + contract_address_hash + |> Hash.to_string() + |> String.slice(0, 6) + end end diff --git a/apps/indexer/test/indexer/token_fetcher_test.exs b/apps/indexer/test/indexer/token_fetcher_test.exs index 18cc4f4b1b..2dfa7051c0 100644 --- a/apps/indexer/test/indexer/token_fetcher_test.exs +++ b/apps/indexer/test/indexer/token_fetcher_test.exs @@ -4,7 +4,7 @@ defmodule Indexer.TokenFetcherTest do import Mox - alias Explorer.Chain + alias Explorer.{Chain, Repo} alias Explorer.Chain.Token alias Indexer.TokenFetcher @@ -74,5 +74,119 @@ defmodule Indexer.TokenFetcherTest do }} = Chain.token_from_address_hash(contract_address_hash) end end + + test "considers the contract address formatted hash when it is an invalid string", %{ + json_rpc_named_arguments: json_rpc_named_arguments + } do + token = insert(:token, name: nil, symbol: nil, total_supply: nil, decimals: nil, cataloged: false) + contract_address_hash = token.contract_address_hash + + if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do + expect( + EthereumJSONRPC.Mox, + :json_rpc, + 1, + fn [%{id: "decimals"}, %{id: "name"}, %{id: "symbol"}, %{id: "totalSupply"}], _opts -> + {:ok, + [ + %{ + id: "decimals", + result: "0x0000000000000000000000000000000000000000000000000000000000000012" + }, + %{ + id: "name", + result: + "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001aa796568616e7a652067676761202075797575206e6e6e6e6e200000000000000" + }, + %{ + id: "symbol", + result: + "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003424e540000000000000000000000000000000000000000000000000000000000" + }, + %{ + id: "totalSupply", + result: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" + } + ]} + end + ) + + assert TokenFetcher.run([contract_address_hash], 0, json_rpc_named_arguments) == :ok + assert {:ok, %Token{cataloged: true, name: "0x0000"}} = Chain.token_from_address_hash(contract_address_hash) + end + end + + test "considers the symbol nil when it is an invalid string", %{json_rpc_named_arguments: json_rpc_named_arguments} do + token = insert(:token, name: nil, symbol: nil, total_supply: nil, decimals: nil, cataloged: false) + contract_address_hash = token.contract_address_hash + + if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do + expect( + EthereumJSONRPC.Mox, + :json_rpc, + 1, + fn [%{id: "decimals"}, %{id: "name"}, %{id: "symbol"}, %{id: "totalSupply"}], _opts -> + {:ok, + [ + %{ + id: "decimals", + result: "0x0000000000000000000000000000000000000000000000000000000000000012" + }, + %{ + id: "name", + result: + "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003424e540000000000000000000000000000000000000000000000000000000000" + }, + %{ + id: "symbol", + result: + "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001aa796568616e7a652067676761202075797575206e6e6e6e6e200000000000000" + }, + %{ + id: "totalSupply", + result: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" + } + ]} + end + ) + + assert TokenFetcher.run([contract_address_hash], 0, json_rpc_named_arguments) == :ok + assert {:ok, %Token{cataloged: true, symbol: nil}} = Chain.token_from_address_hash(contract_address_hash) + end + end + + test "considers name as nil when the name is nil", %{json_rpc_named_arguments: json_rpc_named_arguments} do + token = insert(:token, name: nil, symbol: nil, total_supply: nil, decimals: nil, cataloged: false) + contract_address_hash = token.contract_address_hash + + if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do + expect( + EthereumJSONRPC.Mox, + :json_rpc, + 1, + fn [%{id: "decimals"}, %{id: "name"}, %{id: "symbol"}, %{id: "totalSupply"}], _opts -> + {:ok, + [ + %{ + id: "decimals", + result: "0x0000000000000000000000000000000000000000000000000000000000000012" + }, + %{ + id: "symbol", + result: + "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001aa796568616e7a652067676761202075797575206e6e6e6e6e200000000000000" + }, + %{ + id: "totalSupply", + result: "0x0000000000000000000000000000000000000000000000000de0b6b3a7640000" + } + ]} + end + ) + + assert TokenFetcher.run([contract_address_hash], 0, json_rpc_named_arguments) == :ok + assert {:ok, %Token{cataloged: true, name: nil}} = Chain.token_from_address_hash(contract_address_hash) + end + end end end