From e3b485771deb9e3eb44723ca2494592462b32aa6 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 17 Jul 2019 14:54:47 +0300 Subject: [PATCH 001/290] Split API's endpoints into separate router --- apps/block_scout_web/config/config.exs | 2 + .../lib/block_scout_web/api_router.ex | 72 +++++++++++++++++++ .../lib/block_scout_web/router.ex | 56 +++------------ 3 files changed, 85 insertions(+), 45 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/api_router.ex diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index 836a21ba02..f99647694d 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -86,6 +86,8 @@ config :wobserver, discovery: :none, mode: :plug +config :block_scout_web, BlockScoutWeb.ApiRouter, enabled: System.get_env("DISABLE_API") != "true" + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex new file mode 100644 index 0000000000..c40bd69e73 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex @@ -0,0 +1,72 @@ +defmodule BlockScoutWeb.ApiRouter do + @moduledoc """ + Router for API + """ + use BlockScoutWeb, :router + + alias BlockScoutWeb.API.RPC + alias BlockScoutWeb.Plug.GraphQL + + pipeline :api do + plug(:accepts, ["json"]) + end + + scope "/v1", BlockScoutWeb.API.V1, as: :api_v1 do + pipe_through(:api) + + get("/supply", SupplyController, :supply) + + get("/health", HealthController, :health) + + post("/decompiled_smart_contract", DecompiledSmartContractController, :create) + post("/verified_smart_contracts", VerifiedSmartContractController, :create) + post("/contract_verifications", BlockScoutWeb.AddressContractVerificationController, :create) + + post("/eth_rpc", EthController, :eth_request) + + forward("/", RPCTranslator, %{ + "block" => RPC.BlockController, + "account" => RPC.AddressController, + "logs" => RPC.LogsController, + "token" => RPC.TokenController, + "stats" => RPC.StatsController, + "contract" => RPC.ContractController, + "transaction" => RPC.TransactionController + }) + end + + # Needs to be 200 to support the schema introspection for graphiql + @max_complexity 200 + + forward("/graphql", Absinthe.Plug, + schema: BlockScoutWeb.Schema, + analyze_complexity: true, + max_complexity: @max_complexity + ) + + forward("/graphiql", Absinthe.Plug.GraphiQL, + schema: BlockScoutWeb.Schema, + interface: :advanced, + default_query: GraphQL.default_query(), + socket: BlockScoutWeb.UserSocket, + analyze_complexity: true, + max_complexity: @max_complexity + ) + + # For backward compatibility. Should be removed + scope "/", BlockScoutWeb.API.RPC do + pipe_through(:api) + + post("/eth_rpc", EthController, :eth_request) + + forward("/", RPCTranslator, %{ + "block" => RPC.BlockController, + "account" => RPC.AddressController, + "logs" => RPC.LogsController, + "token" => RPC.TokenController, + "stats" => RPC.StatsController, + "contract" => RPC.ContractController, + "transaction" => RPC.TransactionController + }) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index 4f5a8e1bed..f52493d25c 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -6,53 +6,11 @@ defmodule BlockScoutWeb.Router do forward("/wobserver", Wobserver.Web.Router) forward("/admin", BlockScoutWeb.AdminRouter) - pipeline :browser do - plug(:accepts, ["html"]) - plug(:fetch_session) - plug(:fetch_flash) - plug(:protect_from_forgery) - plug(BlockScoutWeb.CSPHeader) - end - - pipeline :api do - plug(:accepts, ["json"]) - end - - scope "/api/v1", BlockScoutWeb.API.V1, as: :api_v1 do - pipe_through(:api) - - get("/supply", SupplyController, :supply) - - get("/health", HealthController, :health) - - resources("/decompiled_smart_contract", DecompiledSmartContractController, only: [:create]) - resources("/verified_smart_contracts", VerifiedSmartContractController, only: [:create]) - end - - scope "/verify_smart_contract" do - pipe_through(:api) - - post("/contract_verifications", BlockScoutWeb.AddressContractVerificationController, :create) - end - - scope "/api", BlockScoutWeb.API.RPC do - pipe_through(:api) - - alias BlockScoutWeb.API.RPC - - post("/eth_rpc", EthController, :eth_request) - - forward("/", RPCTranslator, %{ - "block" => RPC.BlockController, - "account" => RPC.AddressController, - "logs" => RPC.LogsController, - "token" => RPC.TokenController, - "stats" => RPC.StatsController, - "contract" => RPC.ContractController, - "transaction" => RPC.TransactionController - }) + if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter, :enabled) do + forward("/api", BlockScoutWeb.ApiRouter) end + # For backward compatibility. Should be removed # Needs to be 200 to support the schema introspection for graphiql @max_complexity 200 @@ -71,6 +29,14 @@ defmodule BlockScoutWeb.Router do max_complexity: @max_complexity ) + pipeline :browser do + plug(:accepts, ["html"]) + plug(:fetch_session) + plug(:fetch_flash) + plug(:protect_from_forgery) + plug(BlockScoutWeb.CSPHeader) + end + # Disallows Iframes (write routes) scope "/", BlockScoutWeb do pipe_through(:browser) From 6bb49e01303f04b2b661d7822c61dd2ddca4f74d Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 17 Jul 2019 14:59:10 +0300 Subject: [PATCH 002/290] Update tests to work with new routes path --- .../templates/address_contract_verification/new.html.eex | 2 +- .../views/address_contract_verification_view.ex | 5 +++++ .../api/v1/decompiled_smart_contract_controller_test.exs | 5 +++++ .../controllers/api/v1/health_controller_test.exs | 6 ++++++ .../controllers/api/v1/supply_controller_test.exs | 5 +++++ .../api/v1/verified_smart_contract_controller_test.exs | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) 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 fd93b0af2b..a1a715a734 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 @@ -9,7 +9,7 @@

<%= gettext "New Smart Contract Verification" %>

<%= form_for @changeset, - address_contract_verification_path(@conn, :create), + api_v1_address_contract_verification_path(@conn, :create), [], fn f -> %> diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex index 874b470406..b8e39ab547 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex @@ -1,3 +1,8 @@ defmodule BlockScoutWeb.AddressContractVerificationView do use BlockScoutWeb, :view + alias BlockScoutWeb.ApiRouter.Helpers + + def api_v1_address_contract_verification_path(conn, action) do + "/api" <> Helpers.api_v1_address_contract_verification_path(conn, action) + end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller_test.exs index d6b52c8490..b39d6688e0 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller_test.exs @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.API.V1.DecompiledControllerTest do use BlockScoutWeb.ConnCase + alias BlockScoutWeb.ApiRouter.Helpers alias Explorer.Repo alias Explorer.Chain.{Address, DecompiledSmartContract} @@ -114,4 +115,8 @@ defmodule BlockScoutWeb.API.V1.DecompiledControllerTest do assert request.status == 403 end end + + def api_v1_decompiled_smart_contract_path(conn, action) do + "/api" <> Helpers.api_v1_decompiled_smart_contract_path(conn, action) + end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs index 41735f685a..53abd8b880 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs @@ -1,6 +1,8 @@ defmodule BlockScoutWeb.API.V1.HealthControllerTest do use BlockScoutWeb.ConnCase + alias BlockScoutWeb.ApiRouter.Helpers + describe "GET last_block_status/0" do test "returns error when there are no blocks in db", %{conn: conn} do request = get(conn, api_v1_health_path(conn, :health)) @@ -47,4 +49,8 @@ defmodule BlockScoutWeb.API.V1.HealthControllerTest do } = Poison.decode!(request.resp_body) end end + + def api_v1_health_path(conn, action) do + "/api" <> Helpers.api_v1_health_path(conn, action) + end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/supply_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/supply_controller_test.exs index 268169a21c..2ad2f41758 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/supply_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/supply_controller_test.exs @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.API.V1.SupplyControllerTest do use BlockScoutWeb.ConnCase + alias BlockScoutWeb.ApiRouter.Helpers alias Explorer.Chain test "supply", %{conn: conn} do @@ -10,4 +11,8 @@ defmodule BlockScoutWeb.API.V1.SupplyControllerTest do assert response["total_supply"] == Chain.total_supply() assert response["circulating_supply"] == Chain.circulating_supply() end + + def api_v1_supply_path(conn, action) do + "/api" <> Helpers.api_v1_supply_path(conn, action) + end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/verified_smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/verified_smart_contract_controller_test.exs index 2e51f42467..d11844e933 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/verified_smart_contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/verified_smart_contract_controller_test.exs @@ -1,6 +1,7 @@ defmodule BlockScoutWeb.API.V1.VerifiedControllerTest do use BlockScoutWeb.ConnCase + alias BlockScoutWeb.ApiRouter.Helpers alias Explorer.Factory # alias Explorer.Chain.DecompiledSmartContract @@ -69,4 +70,8 @@ defmodule BlockScoutWeb.API.V1.VerifiedControllerTest do assert response.status == 201 assert Jason.decode!(response.resp_body) == %{"status" => "success"} end + + def api_v1_verified_smart_contract_path(conn, action) do + "/api" <> Helpers.api_v1_verified_smart_contract_path(conn, action) + end end From a883d248ae60a0569e45990b0449c09c79c68e7b Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 17 Jul 2019 15:43:49 +0300 Subject: [PATCH 003/290] Split web app's endpoints into a new router --- apps/block_scout_web/config/config.exs | 1 + apps/block_scout_web/lib/block_scout_web.ex | 2 + .../lib/block_scout_web/router.ex | 232 ++---------------- .../lib/block_scout_web/web_router.ex | 207 ++++++++++++++++ 4 files changed, 232 insertions(+), 210 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/web_router.ex diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index f99647694d..84f60a2842 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -87,6 +87,7 @@ config :wobserver, mode: :plug config :block_scout_web, BlockScoutWeb.ApiRouter, enabled: System.get_env("DISABLE_API") != "true" +config :block_scout_web, BlockScoutWeb.WebRouter, enabled: System.get_env("DISABLE_WEBAPP") != "true" # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. diff --git a/apps/block_scout_web/lib/block_scout_web.ex b/apps/block_scout_web/lib/block_scout_web.ex index 4e1f857526..7cbe856f5f 100644 --- a/apps/block_scout_web/lib/block_scout_web.ex +++ b/apps/block_scout_web/lib/block_scout_web.ex @@ -24,6 +24,7 @@ defmodule BlockScoutWeb do import BlockScoutWeb.Controller import BlockScoutWeb.Router.Helpers + import BlockScoutWeb.WebRouter.Helpers, except: [static_path: 2] import BlockScoutWeb.Gettext import BlockScoutWeb.ErrorHelpers import Plug.Conn @@ -54,6 +55,7 @@ defmodule BlockScoutWeb do Views.ScriptHelpers, WeiHelpers } + import BlockScoutWeb.WebRouter.Helpers, except: [static_path: 2] import PhoenixFormAwesomplete end diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index f52493d25c..e522ce842e 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -3,32 +3,6 @@ defmodule BlockScoutWeb.Router do alias BlockScoutWeb.Plug.GraphQL - forward("/wobserver", Wobserver.Web.Router) - forward("/admin", BlockScoutWeb.AdminRouter) - - if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter, :enabled) do - forward("/api", BlockScoutWeb.ApiRouter) - end - - # For backward compatibility. Should be removed - # Needs to be 200 to support the schema introspection for graphiql - @max_complexity 200 - - forward("/graphql", Absinthe.Plug, - schema: BlockScoutWeb.Schema, - analyze_complexity: true, - max_complexity: @max_complexity - ) - - forward("/graphiql", Absinthe.Plug.GraphiQL, - schema: BlockScoutWeb.Schema, - interface: :advanced, - default_query: GraphQL.default_query(), - socket: BlockScoutWeb.UserSocket, - analyze_complexity: true, - max_complexity: @max_complexity - ) - pipeline :browser do plug(:accepts, ["html"]) plug(:fetch_session) @@ -37,196 +11,34 @@ defmodule BlockScoutWeb.Router do plug(BlockScoutWeb.CSPHeader) end - # Disallows Iframes (write routes) - scope "/", BlockScoutWeb do - pipe_through(:browser) - end + forward("/wobserver", Wobserver.Web.Router) + forward("/admin", BlockScoutWeb.AdminRouter) - # Allows Iframes (read-only routes) - scope "/", BlockScoutWeb do - pipe_through([:browser, BlockScoutWeb.Plug.AllowIframe]) + if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter, :enabled) do + forward("/api", BlockScoutWeb.ApiRouter) - resources("/", ChainController, only: [:show], singleton: true, as: :chain) + # For backward compatibility. Should be removed + # Needs to be 200 to support the schema introspection for graphiql + @max_complexity 200 - resources("/market_history_chart", Chain.MarketHistoryChartController, - only: [:show], - singleton: true + forward("/graphql", Absinthe.Plug, + schema: BlockScoutWeb.Schema, + analyze_complexity: true, + max_complexity: @max_complexity ) - resources "/blocks", BlockController, only: [:index, :show], param: "hash_or_number" do - resources("/transactions", BlockTransactionController, only: [:index], as: :transaction) - end - - get("/reorgs", BlockController, :reorg, as: :reorg) - - get("/uncles", BlockController, :uncle, as: :uncle) - - resources("/pending_transactions", PendingTransactionController, only: [:index]) - - resources("/recent_transactions", RecentTransactionsController, only: [:index]) - - get("/txs", TransactionController, :index) - - resources "/tx", TransactionController, only: [:show] do - resources( - "/internal_transactions", - TransactionInternalTransactionController, - only: [:index], - as: :internal_transaction - ) - - resources( - "/raw_trace", - TransactionRawTraceController, - only: [:index], - as: :raw_trace - ) - - resources("/logs", TransactionLogController, only: [:index], as: :log) - - resources("/token_transfers", TransactionTokenTransferController, - only: [:index], - as: :token_transfer - ) - end - - resources("/accounts", AddressController, only: [:index]) - - resources "/address", AddressController, only: [:show] do - resources("/transactions", AddressTransactionController, only: [:index], as: :transaction) - - resources( - "/internal_transactions", - AddressInternalTransactionController, - only: [:index], - as: :internal_transaction - ) - - resources( - "/validations", - AddressValidationController, - only: [:index], - as: :validation - ) - - resources( - "/contracts", - AddressContractController, - only: [:index], - as: :contract - ) - - resources( - "/decompiled_contracts", - AddressDecompiledContractController, - only: [:index], - as: :decompiled_contract - ) - - resources( - "/logs", - AddressLogsController, - only: [:index], - as: :logs - ) - - resources( - "/contract_verifications", - AddressContractVerificationController, - only: [:new], - as: :verify_contract - ) - - resources( - "/read_contract", - AddressReadContractController, - only: [:index, :show], - as: :read_contract - ) - - resources("/tokens", AddressTokenController, only: [:index], as: :token) do - resources( - "/token_transfers", - AddressTokenTransferController, - only: [:index], - as: :transfers - ) - end - - resources( - "/token_balances", - AddressTokenBalanceController, - only: [:index], - as: :token_balance - ) - - resources( - "/coin_balances", - AddressCoinBalanceController, - only: [:index], - as: :coin_balance - ) - - resources( - "/coin_balances/by_day", - AddressCoinBalanceByDayController, - only: [:index], - as: :coin_balance_by_day - ) - end - - resources "/tokens", Tokens.TokenController, only: [:show], as: :token do - resources( - "/token_transfers", - Tokens.TransferController, - only: [:index], - as: :transfer - ) - - resources( - "/read_contract", - Tokens.ReadContractController, - only: [:index], - as: :read_contract - ) - - resources( - "/token_holders", - Tokens.HolderController, - only: [:index], - as: :holder - ) - - resources( - "/inventory", - Tokens.InventoryController, - only: [:index], - as: :inventory - ) - end - - resources( - "/smart_contracts", - SmartContractController, - only: [:index, :show], - as: :smart_contract + forward("/graphiql", Absinthe.Plug.GraphiQL, + schema: BlockScoutWeb.Schema, + interface: :advanced, + default_query: GraphQL.default_query(), + socket: BlockScoutWeb.UserSocket, + analyze_complexity: true, + max_complexity: @max_complexity ) + end - get("/search", ChainController, :search) - - get("/search_logs", AddressLogsController, :search_logs) - - get("/transactions_csv", AddressTransactionController, :transactions_csv) - - get("/token_autocomplete", ChainController, :token_autocomplete) - - get("/token_transfers_csv", AddressTransactionController, :token_transfers_csv) - - get("/chain_blocks", ChainController, :chain_blocks, as: :chain_blocks) - - get("/api_docs", APIDocsController, :index) - get("/eth_rpc_api_docs", APIDocsController, :eth_rpc) - - get("/:page", PageNotFoundController, :index) + if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter, :enabled) do + forward("/", BlockScoutWeb.WebRouter) end + end diff --git a/apps/block_scout_web/lib/block_scout_web/web_router.ex b/apps/block_scout_web/lib/block_scout_web/web_router.ex new file mode 100644 index 0000000000..9b250332db --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/web_router.ex @@ -0,0 +1,207 @@ +defmodule BlockScoutWeb.WebRouter do + @moduledoc """ + Router for web app + """ + use BlockScoutWeb, :router + + pipeline :browser do + plug(:accepts, ["html"]) + plug(:fetch_session) + plug(:fetch_flash) + plug(:protect_from_forgery) + plug(BlockScoutWeb.CSPHeader) + end + + # Disallows Iframes (write routes) + scope "/", BlockScoutWeb do + pipe_through(:browser) + end + + # Allows Iframes (read-only routes) + scope "/", BlockScoutWeb do + pipe_through([:browser, BlockScoutWeb.Plug.AllowIframe]) + + resources("/", ChainController, only: [:show], singleton: true, as: :chain) + + resources("/market_history_chart", Chain.MarketHistoryChartController, + only: [:show], + singleton: true + ) + + resources "/blocks", BlockController, only: [:index, :show], param: "hash_or_number" do + resources("/transactions", BlockTransactionController, only: [:index], as: :transaction) + end + + get("/reorgs", BlockController, :reorg, as: :reorg) + + get("/uncles", BlockController, :uncle, as: :uncle) + + resources("/pending_transactions", PendingTransactionController, only: [:index]) + + resources("/recent_transactions", RecentTransactionsController, only: [:index]) + + get("/txs", TransactionController, :index) + + resources "/tx", TransactionController, only: [:show] do + resources( + "/internal_transactions", + TransactionInternalTransactionController, + only: [:index], + as: :internal_transaction + ) + + resources( + "/raw_trace", + TransactionRawTraceController, + only: [:index], + as: :raw_trace + ) + + resources("/logs", TransactionLogController, only: [:index], as: :log) + + resources("/token_transfers", TransactionTokenTransferController, + only: [:index], + as: :token_transfer + ) + end + + resources("/accounts", AddressController, only: [:index]) + + resources "/address", AddressController, only: [:show] do + resources("/transactions", AddressTransactionController, only: [:index], as: :transaction) + + resources( + "/internal_transactions", + AddressInternalTransactionController, + only: [:index], + as: :internal_transaction + ) + + resources( + "/validations", + AddressValidationController, + only: [:index], + as: :validation + ) + + resources( + "/contracts", + AddressContractController, + only: [:index], + as: :contract + ) + + resources( + "/decompiled_contracts", + AddressDecompiledContractController, + only: [:index], + as: :decompiled_contract + ) + + resources( + "/logs", + AddressLogsController, + only: [:index], + as: :logs + ) + + resources( + "/contract_verifications", + AddressContractVerificationController, + only: [:new], + as: :verify_contract + ) + + resources( + "/read_contract", + AddressReadContractController, + only: [:index, :show], + as: :read_contract + ) + + resources("/tokens", AddressTokenController, only: [:index], as: :token) do + resources( + "/token_transfers", + AddressTokenTransferController, + only: [:index], + as: :transfers + ) + end + + resources( + "/token_balances", + AddressTokenBalanceController, + only: [:index], + as: :token_balance + ) + + resources( + "/coin_balances", + AddressCoinBalanceController, + only: [:index], + as: :coin_balance + ) + + resources( + "/coin_balances/by_day", + AddressCoinBalanceByDayController, + only: [:index], + as: :coin_balance_by_day + ) + end + + resources "/tokens", Tokens.TokenController, only: [:show], as: :token do + resources( + "/token_transfers", + Tokens.TransferController, + only: [:index], + as: :transfer + ) + + resources( + "/read_contract", + Tokens.ReadContractController, + only: [:index], + as: :read_contract + ) + + resources( + "/token_holders", + Tokens.HolderController, + only: [:index], + as: :holder + ) + + resources( + "/inventory", + Tokens.InventoryController, + only: [:index], + as: :inventory + ) + end + + resources( + "/smart_contracts", + SmartContractController, + only: [:index, :show], + as: :smart_contract + ) + + get("/search", ChainController, :search) + + get("/search_logs", AddressLogsController, :search_logs) + + get("/transactions_csv", AddressTransactionController, :transactions_csv) + + get("/token_autocomplete", ChainController, :token_autocomplete) + + get("/token_transfers_csv", AddressTransactionController, :token_transfers_csv) + + get("/chain_blocks", ChainController, :chain_blocks, as: :chain_blocks) + + get("/api_docs", APIDocsController, :index) + get("/eth_rpc_api_docs", APIDocsController, :eth_rpc) + + get("/:page", PageNotFoundController, :index) + end +end From d3c60b0ec5fd7accac278c685124f1ea5c8ddef3 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 17 Jul 2019 15:44:50 +0300 Subject: [PATCH 004/290] Update test to work with a new web app's router --- .../controllers/address_contract_controller_test.exs | 2 +- .../address_internal_transaction_controller_test.exs | 2 +- .../controllers/address_token_controller_test.exs | 2 +- .../controllers/address_token_transfer_controller_test.exs | 2 +- .../controllers/address_transaction_controller_test.exs | 2 +- .../block_scout_web/controllers/api_docs_controller_test.exs | 2 +- .../controllers/block_transaction_controller_test.exs | 2 +- .../test/block_scout_web/controllers/chain_controller_test.exs | 2 +- .../controllers/pending_transaction_controller_test.exs | 2 +- .../controllers/recent_transactions_controller_test.exs | 2 +- .../block_scout_web/controllers/transaction_controller_test.exs | 2 +- .../transaction_internal_transaction_controller_test.exs | 2 +- .../controllers/transaction_log_controller_test.exs | 2 +- .../controllers/transaction_token_transfer_controller_test.exs | 2 +- .../block_scout_web/features/pages/transaction_logs_page.ex | 2 +- apps/block_scout_web/test/support/conn_case.ex | 1 + 16 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_contract_controller_test.exs index 3e3c92cb7f..3b62a40bd5 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_contract_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressContractControllerTest do use BlockScoutWeb.ConnCase, async: true - import BlockScoutWeb.Router.Helpers, only: [address_contract_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [address_contract_path: 3] alias Explorer.Chain.Hash alias Explorer.ExchangeRates.Token diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs index 8f5bc9a667..90b0c6500f 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressInternalTransactionControllerTest do use BlockScoutWeb.ConnCase, async: true - import BlockScoutWeb.Router.Helpers, + import BlockScoutWeb.WebRouter.Helpers, only: [address_internal_transaction_path: 3, address_internal_transaction_path: 4] alias Explorer.Chain.{Block, InternalTransaction, Transaction} diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs index 31a1c2c5cf..16df97b9fc 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressTokenControllerTest do use BlockScoutWeb.ConnCase, async: true - import BlockScoutWeb.Router.Helpers, only: [address_token_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [address_token_path: 3] alias Explorer.Chain.{Token} diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_token_transfer_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_token_transfer_controller_test.exs index a7e29efd10..70a362b109 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_token_transfer_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_token_transfer_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressTokenTransferControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, + import BlockScoutWeb.WebRouter.Helpers, only: [address_token_transfers_path: 4, address_token_transfers_path: 5] alias Explorer.Chain.{Address, Token} diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs index a29d6b9be6..6476432e91 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do use BlockScoutWeb.ConnCase, async: true - import BlockScoutWeb.Router.Helpers, only: [address_transaction_path: 3, address_transaction_path: 4] + import BlockScoutWeb.WebRouter.Helpers, only: [address_transaction_path: 3, address_transaction_path: 4] alias Explorer.Chain.Transaction alias Explorer.ExchangeRates.Token diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs index 3b2cb99ff0..4db9eccd6d 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.APIDocsControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [api_docs_path: 2] + import BlockScoutWeb.WebRouter.Helpers, only: [api_docs_path: 2] describe "GET index/2" do test "renders documentation tiles for each API module#action", %{conn: conn} do diff --git a/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs index da159b6e6e..d76a2fcd1c 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/block_transaction_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.BlockTransactionControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [block_transaction_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [block_transaction_path: 3] describe "GET index/2" do test "with invalid block number", %{conn: conn} do diff --git a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs index f902f15ad4..00a53689c8 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.ChainControllerTest do # ETS table is shared in `Explorer.Counters.AddressesWithBalanceCounter` async: false - import BlockScoutWeb.Router.Helpers, only: [chain_path: 2, block_path: 3, transaction_path: 3, address_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [chain_path: 2, block_path: 3, transaction_path: 3, address_path: 3] alias Explorer.Chain.Block alias Explorer.Counters.AddressesWithBalanceCounter diff --git a/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs index d632154294..b19bec2520 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/pending_transaction_controller_test.exs @@ -2,7 +2,7 @@ defmodule BlockScoutWeb.PendingTransactionControllerTest do use BlockScoutWeb.ConnCase alias Explorer.Chain.{Hash, Transaction} - import BlockScoutWeb.Router.Helpers, only: [pending_transaction_path: 2, pending_transaction_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [pending_transaction_path: 2, pending_transaction_path: 3] describe "GET index/2" do test "returns no transactions that are in a block", %{conn: conn} do diff --git a/apps/block_scout_web/test/block_scout_web/controllers/recent_transactions_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/recent_transactions_controller_test.exs index a35ea19491..0a2267f18c 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/recent_transactions_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/recent_transactions_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.RecentTransactionsControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [recent_transactions_path: 2] + import BlockScoutWeb.WebRouter.Helpers, only: [recent_transactions_path: 2] alias Explorer.Chain.Hash diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_controller_test.exs index cd2e557f93..80e8b12b70 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.TransactionControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, + import BlockScoutWeb.WebRouter.Helpers, only: [transaction_path: 3, transaction_internal_transaction_path: 3, transaction_token_transfer_path: 3] alias Explorer.Chain.Transaction diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs index 6b9a32d280..773b51a36c 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_internal_transaction_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [transaction_internal_transaction_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [transaction_internal_transaction_path: 3] alias Explorer.Chain.InternalTransaction alias Explorer.ExchangeRates.Token diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs index 05c7638d52..65142dd0ce 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_log_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.TransactionLogControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [transaction_log_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [transaction_log_path: 3] alias Explorer.ExchangeRates.Token diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs index ca183f5289..6d3c83980b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_token_transfer_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.Router.Helpers, only: [transaction_token_transfer_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [transaction_token_transfer_path: 3] alias Explorer.ExchangeRates.Token diff --git a/apps/block_scout_web/test/block_scout_web/features/pages/transaction_logs_page.ex b/apps/block_scout_web/test/block_scout_web/features/pages/transaction_logs_page.ex index bbb0c7c311..3969cd559c 100644 --- a/apps/block_scout_web/test/block_scout_web/features/pages/transaction_logs_page.ex +++ b/apps/block_scout_web/test/block_scout_web/features/pages/transaction_logs_page.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.TransactionLogsPage do use Wallaby.DSL import Wallaby.Query, only: [css: 1, css: 2] - import BlockScoutWeb.Router.Helpers, only: [transaction_log_path: 3] + import BlockScoutWeb.WebRouter.Helpers, only: [transaction_log_path: 3] alias Explorer.Chain.Transaction alias BlockScoutWeb.Endpoint diff --git a/apps/block_scout_web/test/support/conn_case.ex b/apps/block_scout_web/test/support/conn_case.ex index ca486b33c2..19b125e40a 100644 --- a/apps/block_scout_web/test/support/conn_case.ex +++ b/apps/block_scout_web/test/support/conn_case.ex @@ -20,6 +20,7 @@ defmodule BlockScoutWeb.ConnCase do # Import conveniences for testing with connections use Phoenix.ConnTest import BlockScoutWeb.Router.Helpers + import BlockScoutWeb.WebRouter.Helpers, except: [static_path: 2] # The default endpoint for testing @endpoint BlockScoutWeb.Endpoint From b717c37c0ba110960a9343b50754333b720c58b6 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 17 Jul 2019 16:10:17 +0300 Subject: [PATCH 005/290] Fix failed contract verifications test --- apps/block_scout_web/lib/block_scout_web.ex | 1 + .../lib/block_scout_web/api_router.ex | 35 ++++++++++--------- .../lib/block_scout_web/router.ex | 5 ++- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web.ex b/apps/block_scout_web/lib/block_scout_web.ex index 7cbe856f5f..20ca4351df 100644 --- a/apps/block_scout_web/lib/block_scout_web.ex +++ b/apps/block_scout_web/lib/block_scout_web.ex @@ -55,6 +55,7 @@ defmodule BlockScoutWeb do Views.ScriptHelpers, WeiHelpers } + import BlockScoutWeb.WebRouter.Helpers, except: [static_path: 2] import PhoenixFormAwesomplete diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex index c40bd69e73..650188b6a2 100644 --- a/apps/block_scout_web/lib/block_scout_web/api_router.ex +++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex @@ -11,28 +11,31 @@ defmodule BlockScoutWeb.ApiRouter do plug(:accepts, ["json"]) end - scope "/v1", BlockScoutWeb.API.V1, as: :api_v1 do + scope "/v1", as: :api_v1 do pipe_through(:api) - get("/supply", SupplyController, :supply) + post("/contract_verifications", BlockScoutWeb.AddressContractVerificationController, :create) - get("/health", HealthController, :health) + scope "/", BlockScoutWeb.API.V1 do + get("/supply", SupplyController, :supply) - post("/decompiled_smart_contract", DecompiledSmartContractController, :create) - post("/verified_smart_contracts", VerifiedSmartContractController, :create) - post("/contract_verifications", BlockScoutWeb.AddressContractVerificationController, :create) + get("/health", HealthController, :health) - post("/eth_rpc", EthController, :eth_request) + post("/decompiled_smart_contract", DecompiledSmartContractController, :create) + post("/verified_smart_contracts", VerifiedSmartContractController, :create) - forward("/", RPCTranslator, %{ - "block" => RPC.BlockController, - "account" => RPC.AddressController, - "logs" => RPC.LogsController, - "token" => RPC.TokenController, - "stats" => RPC.StatsController, - "contract" => RPC.ContractController, - "transaction" => RPC.TransactionController - }) + post("/eth_rpc", EthController, :eth_request) + + forward("/", RPCTranslator, %{ + "block" => RPC.BlockController, + "account" => RPC.AddressController, + "logs" => RPC.LogsController, + "token" => RPC.TokenController, + "stats" => RPC.StatsController, + "contract" => RPC.ContractController, + "transaction" => RPC.TransactionController + }) + end end # Needs to be 200 to support the schema introspection for graphiql diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index e522ce842e..1354c57d56 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -14,7 +14,7 @@ defmodule BlockScoutWeb.Router do forward("/wobserver", Wobserver.Web.Router) forward("/admin", BlockScoutWeb.AdminRouter) - if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter, :enabled) do + if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter)[:enabled] do forward("/api", BlockScoutWeb.ApiRouter) # For backward compatibility. Should be removed @@ -37,8 +37,7 @@ defmodule BlockScoutWeb.Router do ) end - if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter, :enabled) do + if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter)[:enabled] do forward("/", BlockScoutWeb.WebRouter) end - end From 9a7629765194cc8ce5c19462d22a7ab103e153e7 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 18 Jul 2019 16:59:13 +0300 Subject: [PATCH 006/290] Update routers to hide and show api's docs --- .../lib/block_scout_web/api_router.ex | 21 -- .../lib/block_scout_web/router.ex | 46 +++- .../new.html.eex | 2 +- .../templates/layout/_topnav.html.eex | 204 +++++++++--------- .../address_contract_verification_view.ex | 5 - .../lib/block_scout_web/web_router.ex | 3 - .../api/v1/health_controller_test.exs | 6 - .../controllers/api_docs_controller_test.exs | 2 +- 8 files changed, 147 insertions(+), 142 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/api_router.ex b/apps/block_scout_web/lib/block_scout_web/api_router.ex index 650188b6a2..73386dd4fa 100644 --- a/apps/block_scout_web/lib/block_scout_web/api_router.ex +++ b/apps/block_scout_web/lib/block_scout_web/api_router.ex @@ -5,7 +5,6 @@ defmodule BlockScoutWeb.ApiRouter do use BlockScoutWeb, :router alias BlockScoutWeb.API.RPC - alias BlockScoutWeb.Plug.GraphQL pipeline :api do plug(:accepts, ["json"]) @@ -19,8 +18,6 @@ defmodule BlockScoutWeb.ApiRouter do scope "/", BlockScoutWeb.API.V1 do get("/supply", SupplyController, :supply) - get("/health", HealthController, :health) - post("/decompiled_smart_contract", DecompiledSmartContractController, :create) post("/verified_smart_contracts", VerifiedSmartContractController, :create) @@ -38,24 +35,6 @@ defmodule BlockScoutWeb.ApiRouter do end end - # Needs to be 200 to support the schema introspection for graphiql - @max_complexity 200 - - forward("/graphql", Absinthe.Plug, - schema: BlockScoutWeb.Schema, - analyze_complexity: true, - max_complexity: @max_complexity - ) - - forward("/graphiql", Absinthe.Plug.GraphiQL, - schema: BlockScoutWeb.Schema, - interface: :advanced, - default_query: GraphQL.default_query(), - socket: BlockScoutWeb.UserSocket, - analyze_complexity: true, - max_complexity: @max_complexity - ) - # For backward compatibility. Should be removed scope "/", BlockScoutWeb.API.RPC do pipe_through(:api) diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index 1354c57d56..62c6e09d91 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -2,6 +2,10 @@ defmodule BlockScoutWeb.Router do use BlockScoutWeb, :router alias BlockScoutWeb.Plug.GraphQL + alias BlockScoutWeb.{ApiRouter, WebRouter} + + forward("/wobserver", Wobserver.Web.Router) + forward("/admin", BlockScoutWeb.AdminRouter) pipeline :browser do plug(:accepts, ["html"]) @@ -11,13 +15,24 @@ defmodule BlockScoutWeb.Router do plug(BlockScoutWeb.CSPHeader) end - forward("/wobserver", Wobserver.Web.Router) - forward("/admin", BlockScoutWeb.AdminRouter) + pipeline :api do + plug(:accepts, ["json"]) + end + + scope "/", BlockScoutWeb.API.V1, as: :api_v1 do + pipe_through(:api) + get("/api/v1/health", HealthController, :health) + end - if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter)[:enabled] do - forward("/api", BlockScoutWeb.ApiRouter) + scope "/verify_smart_contract" do + pipe_through(:api) + + post("/contract_verifications", BlockScoutWeb.AddressContractVerificationController, :create) + end + + if Application.get_env(:block_scout_web, ApiRouter)[:enabled] do + forward("/api", ApiRouter) - # For backward compatibility. Should be removed # Needs to be 200 to support the schema introspection for graphiql @max_complexity 200 @@ -35,9 +50,28 @@ defmodule BlockScoutWeb.Router do analyze_complexity: true, max_complexity: @max_complexity ) + else + scope "/", BlockScoutWeb do + pipe_through(:browser) + get("/api_docs", PageNotFoundController, :index) + get("/eth_rpc_api_docs", PageNotFoundController, :index) + end end - if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter)[:enabled] do + scope "/", BlockScoutWeb do + pipe_through(:browser) + + get("/api_docs", APIDocsController, :index) + get("/eth_rpc_api_docs", APIDocsController, :eth_rpc) + end + + if Application.get_env(:block_scout_web, WebRouter)[:enabled] do forward("/", BlockScoutWeb.WebRouter) + else + scope "/", BlockScoutWeb do + pipe_through(:browser) + + forward("/", APIDocsController, :index) + end end end 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 a1a715a734..fd93b0af2b 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 @@ -9,7 +9,7 @@

<%= gettext "New Smart Contract Verification" %>

<%= form_for @changeset, - api_v1_address_contract_verification_path(@conn, :create), + address_contract_verification_path(@conn, :create), [], fn f -> %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index f152ec6bf9..3ae4779284 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -8,79 +8,83 @@ - -
  • - -
    - <%= link( - gettext("Validated"), - class: "dropdown-item #{tab_status("txs", @conn.request_path)}", - to: transaction_path(@conn, :index) - ) %> - <%= link( - gettext("Pending"), - class: "dropdown-item #{tab_status("pending_transactions", @conn.request_path)}", - "data-test": "pending_transactions_link", - to: pending_transaction_path(@conn, :index) - ) %> -
    -
    • -
  • - <%= link to: address_path(@conn, :index), class: "nav-link topnav-nav-link #{tab_status("accounts", @conn.request_path)}" do %> - - <%= render BlockScoutWeb.IconsView, "_accounts_icon.html" %> - - <%= gettext("Accounts") %> - <% end %> -
    • -
  • - -
    - <%= link( - gettext("GraphQL"), - class: "dropdown-item #{tab_status("graphiql", @conn.request_path)}", - to: "/graphiql" - ) %> - <%= link( - gettext("RPC"), - class: "dropdown-item #{tab_status("api_docs", @conn.request_path)}", - to: api_docs_path(@conn, :index) - ) %> - <%= link( - gettext("Eth RPC"), - class: "dropdown-item #{tab_status("api_docs", @conn.request_path)}", - to: api_docs_path(@conn, :eth_rpc) - ) %> -
    -
    • + + <% end %> + <%= if Application.get_env(:block_scout_web, BlockScoutWeb.ApiRouter)[:enabled] do %> +
  • + +
    + <%= link( + gettext("GraphQL"), + class: "dropdown-item #{tab_status("graphiql", @conn.request_path)}", + to: "/graphiql" + ) %> + <%= link( + gettext("RPC"), + class: "dropdown-item #{tab_status("api_docs", @conn.request_path)}", + to: api_docs_path(@conn, :index) + ) %> + <%= link( + gettext("Eth RPC"), + class: "dropdown-item #{tab_status("api_docs", @conn.request_path)}", + to: api_docs_path(@conn, :eth_rpc) + ) %> +
    +
    • + <% end %>
  • " href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> @@ -91,34 +95,36 @@
    • -
    - <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0", method: :get, enforce_utf8: false], fn f -> %> -
    - <%= awesomplete(f, :q, - [ - class: "form-control me auto", - placeholder: gettext("Search by address, token symbol name, transaction hash, or block number"), - "aria-describedby": "search-icon", - "aria-label": gettext("Search"), - "data-test": "search_input" - ], - [ url: "#{chain_path(@conn, :token_autocomplete)}?q=", - limit: 0, - minChars: 2, - value: "contract_address_hash", - label: "contract_address_hash", - descrSearch: true, - descr: "symbol" - ]) %> -
    - -
    -
    - - <% end %> -
    + <%= if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter)[:enabled] do %> +
    + <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0", method: :get, enforce_utf8: false], fn f -> %> +
    + <%= awesomplete(f, :q, + [ + class: "form-control me auto", + placeholder: gettext("Search by address, token symbol name, transaction hash, or block number"), + "aria-describedby": "search-icon", + "aria-label": gettext("Search"), + "data-test": "search_input" + ], + [ url: "#{chain_path(@conn, :token_autocomplete)}?q=", + limit: 0, + minChars: 2, + value: "contract_address_hash", + label: "contract_address_hash", + descrSearch: true, + descr: "symbol" + ]) %> +
    + +
    +
    + + <% end %> +
    + <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex index b8e39ab547..874b470406 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_verification_view.ex @@ -1,8 +1,3 @@ defmodule BlockScoutWeb.AddressContractVerificationView do use BlockScoutWeb, :view - alias BlockScoutWeb.ApiRouter.Helpers - - def api_v1_address_contract_verification_path(conn, action) do - "/api" <> Helpers.api_v1_address_contract_verification_path(conn, action) - end end diff --git a/apps/block_scout_web/lib/block_scout_web/web_router.ex b/apps/block_scout_web/lib/block_scout_web/web_router.ex index 9b250332db..6b445a7b41 100644 --- a/apps/block_scout_web/lib/block_scout_web/web_router.ex +++ b/apps/block_scout_web/lib/block_scout_web/web_router.ex @@ -199,9 +199,6 @@ defmodule BlockScoutWeb.WebRouter do get("/chain_blocks", ChainController, :chain_blocks, as: :chain_blocks) - get("/api_docs", APIDocsController, :index) - get("/eth_rpc_api_docs", APIDocsController, :eth_rpc) - get("/:page", PageNotFoundController, :index) end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs index 53abd8b880..41735f685a 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs @@ -1,8 +1,6 @@ defmodule BlockScoutWeb.API.V1.HealthControllerTest do use BlockScoutWeb.ConnCase - alias BlockScoutWeb.ApiRouter.Helpers - describe "GET last_block_status/0" do test "returns error when there are no blocks in db", %{conn: conn} do request = get(conn, api_v1_health_path(conn, :health)) @@ -49,8 +47,4 @@ defmodule BlockScoutWeb.API.V1.HealthControllerTest do } = Poison.decode!(request.resp_body) end end - - def api_v1_health_path(conn, action) do - "/api" <> Helpers.api_v1_health_path(conn, action) - end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs index 4db9eccd6d..3b2cb99ff0 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api_docs_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.APIDocsControllerTest do use BlockScoutWeb.ConnCase - import BlockScoutWeb.WebRouter.Helpers, only: [api_docs_path: 2] + import BlockScoutWeb.Router.Helpers, only: [api_docs_path: 2] describe "GET index/2" do test "renders documentation tiles for each API module#action", %{conn: conn} do From 3652aa2a46549a43ae2bab290506e467eefe349d Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 18 Jul 2019 17:03:57 +0300 Subject: [PATCH 007/290] Update gettext --- .../lib/block_scout_web/router.ex | 4 +-- apps/block_scout_web/priv/gettext/default.pot | 32 +++++++++---------- .../priv/gettext/en/LC_MESSAGES/default.po | 32 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index 62c6e09d91..3cbb8dd3bf 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -19,9 +19,9 @@ defmodule BlockScoutWeb.Router do plug(:accepts, ["json"]) end - scope "/", BlockScoutWeb.API.V1, as: :api_v1 do + scope "/api/v1", BlockScoutWeb.API.V1, as: :api_v1 do pipe_through(:api) - get("/api/v1/health", HealthController, :health) + get("/health", HealthController, :health) end scope "/verify_smart_contract" do diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 8217a39d9c..021b81144e 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -87,7 +87,7 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:56 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:57 msgid "Accounts" msgstr "" @@ -178,8 +178,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:87 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:16 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:20 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:17 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:21 msgid "Blocks" msgstr "" @@ -400,7 +400,7 @@ msgid "Fetching tokens..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:26 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:27 msgid "Forked Blocks (Reorgs)" msgstr "" @@ -602,7 +602,7 @@ msgid "Parent Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:44 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:45 #: lib/block_scout_web/views/transaction_view.ex:143 #: lib/block_scout_web/views/transaction_view.ex:177 msgid "Pending" @@ -667,8 +667,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:102 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:119 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:107 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:124 msgid "Search" msgstr "" @@ -871,7 +871,7 @@ msgstr "" #: lib/block_scout_web/templates/block_transaction/index.html.eex:10 #: lib/block_scout_web/templates/block_transaction/index.html.eex:18 #: lib/block_scout_web/templates/chain/show.html.eex:108 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:35 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:36 #: lib/block_scout_web/views/address_view.ex:305 msgid "Transactions" msgstr "" @@ -898,7 +898,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/overview.html.eex:80 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:23 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:24 msgid "Uncles" msgstr "" @@ -913,7 +913,7 @@ msgid "Used" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:39 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:40 msgid "Validated" msgstr "" @@ -1067,12 +1067,12 @@ msgid "Loading...." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:64 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:67 msgid "APIs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:68 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:71 msgid "GraphQL" msgstr "" @@ -1082,7 +1082,7 @@ msgid "Loading" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:73 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:76 msgid "RPC" msgstr "" @@ -1481,8 +1481,8 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:96 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:100 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:101 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:105 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1708,7 +1708,7 @@ msgid "ETH RPC API Documentation" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:78 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:81 msgid "Eth RPC" 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 b58c06af59..abd5fcd3a3 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 @@ -87,7 +87,7 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:56 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:57 msgid "Accounts" msgstr "" @@ -178,8 +178,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:87 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:16 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:20 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:17 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:21 msgid "Blocks" msgstr "" @@ -400,7 +400,7 @@ msgid "Fetching tokens..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:26 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:27 msgid "Forked Blocks (Reorgs)" msgstr "" @@ -602,7 +602,7 @@ msgid "Parent Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:44 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:45 #: lib/block_scout_web/views/transaction_view.ex:143 #: lib/block_scout_web/views/transaction_view.ex:177 msgid "Pending" @@ -667,8 +667,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:102 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:119 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:107 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:124 msgid "Search" msgstr "" @@ -871,7 +871,7 @@ msgstr "" #: lib/block_scout_web/templates/block_transaction/index.html.eex:10 #: lib/block_scout_web/templates/block_transaction/index.html.eex:18 #: lib/block_scout_web/templates/chain/show.html.eex:108 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:35 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:36 #: lib/block_scout_web/views/address_view.ex:305 msgid "Transactions" msgstr "" @@ -898,7 +898,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/overview.html.eex:80 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:23 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:24 msgid "Uncles" msgstr "" @@ -913,7 +913,7 @@ msgid "Used" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:39 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:40 msgid "Validated" msgstr "" @@ -1067,12 +1067,12 @@ msgid "Loading...." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:64 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:67 msgid "APIs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:68 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:71 msgid "GraphQL" msgstr "" @@ -1082,7 +1082,7 @@ msgid "Loading" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:73 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:76 msgid "RPC" msgstr "" @@ -1481,8 +1481,8 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:96 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:100 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:101 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:105 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1708,7 +1708,7 @@ msgid "ETH RPC API Documentation" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:78 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:81 msgid "Eth RPC" msgstr "" From 16a280f7c5af7731bb39a23150efa320b57c4fee Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 22 Jul 2019 10:36:14 +0300 Subject: [PATCH 008/290] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c8934f3d..aed0547a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2376](https://github.com/poanetwork/blockscout/pull/2376) - Split API and WebApp routes - [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty - [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions From c7e835178165fffadb3155c68139397940c9ce4c Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 22 Jul 2019 15:26:57 +0300 Subject: [PATCH 009/290] Return gasPrice at gettxinfo API's method --- apps/block_scout_web/lib/block_scout_web/etherscan.ex | 2 ++ .../lib/block_scout_web/views/api/rpc/transaction_view.ex | 1 + .../controllers/api/rpc/transaction_controller_test.exs | 1 + 3 files changed, 4 insertions(+) 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 2191a86fa2..73f1967900 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -440,6 +440,7 @@ defmodule BlockScoutWeb.Etherscan do "from" => "0x000000000000000000000000000000000000000c", "gasLimit" => "91966", "gasUsed" => "95123", + "gasPrice" => "100000", "hash" => "0x0000000000000000000000000000000000000000000000000000000000000004", "input" => "0x04", "logs" => [ @@ -986,6 +987,7 @@ defmodule BlockScoutWeb.Etherscan do input: @input_type, gasLimit: @wei_type, gasUsed: @gas_type, + gasPrice: @wei_type, logs: %{ type: "array", array_type: @logs_details diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex index e792be8f40..b9e8f7430d 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex @@ -68,6 +68,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionView do "input" => "#{transaction.input}", "gasLimit" => "#{transaction.gas}", "gasUsed" => "#{transaction.gas_used}", + "gasPrice" => "#{transaction.gas_price.value}", "logs" => Enum.map(logs, &prepare_log/1), "next_page_params" => next_page_params } diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs index 9d151e382c..1ac026bc3c 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs @@ -456,6 +456,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "input" => "#{transaction.input}", "gasLimit" => "#{transaction.gas}", "gasUsed" => "#{transaction.gas_used}", + "gasPrice" => "#{transaction.gas_price.value}", "logs" => [ %{ "address" => "#{address.hash}", From 04c72f71d792c9f692461e0f79b6d232734a121f Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 22 Jul 2019 15:32:40 +0300 Subject: [PATCH 010/290] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c8934f3d..75a5e56e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method - [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty - [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions From 1e4de6e41e2936dd4629f70e72f5dde95972698c Mon Sep 17 00:00:00 2001 From: saneery Date: Tue, 23 Jul 2019 12:07:09 +0300 Subject: [PATCH 011/290] Add env to disable indexer supervisor --- apps/indexer/config/config.exs | 2 ++ apps/indexer/lib/indexer/application.ex | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/indexer/config/config.exs b/apps/indexer/config/config.exs index 4e84e9bcfe..b01a09c450 100644 --- a/apps/indexer/config/config.exs +++ b/apps/indexer/config/config.exs @@ -41,6 +41,8 @@ config :indexer, # config :indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: true config :indexer, Indexer.Fetcher.StakingPools.Supervisor, disabled?: true +config :indexer, Indexer.Supervisor, enabled: System.get_env("DISABLE_INDEXER") != "true" + config :indexer, Indexer.Tracer, service: :indexer, adapter: SpandexDatadog.Adapter, diff --git a/apps/indexer/lib/indexer/application.ex b/apps/indexer/lib/indexer/application.ex index cb696567b7..f261ba8057 100644 --- a/apps/indexer/lib/indexer/application.ex +++ b/apps/indexer/lib/indexer/application.ex @@ -17,11 +17,17 @@ defmodule Indexer.Application do memory_monitor_name = Memory.Monitor - children = [ - {Memory.Monitor, [memory_monitor_options, [name: memory_monitor_name]]}, - {Indexer.Supervisor, [%{memory_monitor: memory_monitor_name}]} + base_children = [ + {Memory.Monitor, [memory_monitor_options, [name: memory_monitor_name]]} ] + children = + if Application.get_env(:indexer, Indexer.Supervisor)[:enabled] do + Enum.reverse([{Indexer.Supervisor, [%{memory_monitor: memory_monitor_name}]} | base_children]) + else + base_children + end + opts = [ # If the `Memory.Monitor` dies, it needs all the `Shrinkable`s to re-register, so restart them. strategy: :rest_for_one, From c9250b6991b978a2d2d5814ec4fbb5e136f24f66 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 25 Jul 2019 13:31:13 +0300 Subject: [PATCH 012/290] Add functionality to try eth_rpc methods in documentation --- apps/block_scout_web/assets/js/app.js | 1 + .../assets/js/lib/try_eth_api.js | 70 ++++++++ .../templates/api_docs/_eth_rpc_item.html.eex | 166 ++++++++++++++++++ .../templates/api_docs/eth_rpc.html.eex | 18 +- apps/explorer/lib/explorer/eth_rpc.ex | 28 ++- 5 files changed, 268 insertions(+), 15 deletions(-) create mode 100644 apps/block_scout_web/assets/js/lib/try_eth_api.js create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex diff --git a/apps/block_scout_web/assets/js/app.js b/apps/block_scout_web/assets/js/app.js index 25de7b2688..a800597331 100644 --- a/apps/block_scout_web/assets/js/app.js +++ b/apps/block_scout_web/assets/js/app.js @@ -58,5 +58,6 @@ import './lib/async_listing_load' import './lib/tooltip' import './lib/modals' import './lib/try_api' +import './lib/try_eth_api' import './lib/card_tabs' import './lib/network_selector' diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js new file mode 100644 index 0000000000..a3dd7b6f4e --- /dev/null +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -0,0 +1,70 @@ +import $ from 'jquery' + +function composeCurlCommand (data) { + return `curl -H "content-type: application/json" -X POST --data '${JSON.stringify(data)}'` +} + +function handleResponse (data, xhr, clickedButton) { + const module = clickedButton.attr('data-module') + const action = clickedButton.attr('data-action') + const curl = $(`[data-selector="${module}-${action}-curl"]`)[0] + const code = $(`[data-selector="${module}-${action}-server-response-code"]`)[0] + const body = $(`[data-selector="${module}-${action}-server-response-body"]`)[0] + + curl.innerHTML = composeCurlCommand(data) + code.innerHTML = xhr.status + body.innerHTML = JSON.stringify(xhr.responseJSON, undefined, 2) + $(`[data-selector="${module}-${action}-try-api-ui-result"]`).show() + $(`[data-selector="${module}-${action}-btn-try-api-clear"]`).show() + clickedButton.html(clickedButton.data('original-text')) + clickedButton.prop('disabled', false) +} + +function wrapJsonRpc (method, params) { + return { + id: 0, + jsonrpc: '2.0', + method: method, + params: params + } +} + +function parseInput (input) { + const type = $(input).attr('data-parameter-type') + const value = $(input).val() + + switch (type) { + case 'string': + return value + case 'json': + return JSON.parse(value) + default: + return value + } +} + +$('button[data-try-eth-api-ui-button-type="execute"]').click(event => { + const clickedButton = $(event.target) + const module = clickedButton.attr('data-module') + const action = clickedButton.attr('data-action') + const inputs = $(`input[data-selector="${module}-${action}-try-api-ui"]`) + const params = $.map(inputs, parseInput) + const formData = wrapJsonRpc(action, params) + console.log(formData) + const loadingText = ' Loading...' + + clickedButton.prop('disabled', true) + clickedButton.data('original-text', clickedButton.html()) + + if (clickedButton.html() !== loadingText) { + clickedButton.html(loadingText) + } + + $.ajax({ + url: '/api/eth_rpc', + type: 'POST', + data: JSON.stringify(formData), + dataType: 'json', + contentType: 'application/json; charset=utf-8' + }).then((_data, _status, xhr) => handleResponse(formData, xhr, clickedButton)) +}) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex new file mode 100644 index 0000000000..14e69b95f5 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex @@ -0,0 +1,166 @@ +
    + + + +
    \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex index 134b3e13e1..2c2c453841 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex @@ -18,19 +18,9 @@
    - - - - - - - <%= for {method, info} <- Map.to_list(@documentation) do %> - - - - - - <% end %> -
    Supported MethodNotesParameters example
    <%= method %> <%= Map.get(info, :notes, "N/A") %> <%= Map.get(info, :example, "N/A") %>
    + <%= for {method, info} <- Map.to_list(@documentation) do %> + <%= render "_eth_rpc_item.html", action: method, info: info %> + <% end %> +
    diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex index e0864ac279..3901248938 100644 --- a/apps/explorer/lib/explorer/eth_rpc.ex +++ b/apps/explorer/lib/explorer/eth_rpc.ex @@ -16,7 +16,14 @@ defmodule Explorer.EthRPC do are not currently imported """, example: """ - {"id": 0, "jsonrpc": "2.0", "method": "eth_getBalance", "params": ["0x0000000000000000000000000000000000000007", "2"]} + {"id": 0, "jsonrpc": "2.0", "method": "eth_getBalance", "params": ["0x0000000000000000000000000000000000000007", "latest"]} + """, + params: [ + {"DATA", "20 Bytes - address to check for balance", "string"}, + {"QUANTITY|TAG", "integer block number, or the string \"latest\", \"earliest\" or \"pending\"", "string"} + ], + result: """ + {"id": 0, "jsonrpc": "2.0", "result": "0x0234c8a3397aab58"} """ }, "eth_getLogs" => %{ @@ -33,6 +40,25 @@ defmodule Explorer.EthRPC do "fromBlock": "earliest", "toBlock": "latest", "topics": ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"]}]} + """, + params: [ + {"Object", "The filter options", "json"} + ], + result: """ + { + "id":0, + "jsonrpc":"2.0", + "result": [{ + "logIndex": "0x1", + "blockNumber":"0x1b4", + "blockHash": "0x8216c5785ac562ff41e2dcfdf5785ac562ff41e2dcfdf829c5a142f1fccd7d", + "transactionHash": "0xdf829c5a142f1fccd7d8216c5785ac562ff41e2dcfdf5785ac562ff41e2dcf", + "transactionIndex": "0x0", + "address": "0x16c5785ac562ff41e2dcfdf829c5a142f1fccd7d", + "data":"0x0000000000000000000000000000000000000000000000000000000000000000", + "topics": ["0x59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a5"] + }] + } """ } } From 33a769e8904279f3560618c1eb4fbd88baa1bbd7 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 25 Jul 2019 13:39:41 +0300 Subject: [PATCH 013/290] Update gettext --- apps/block_scout_web/priv/gettext/default.pot | 17 +++++++++++++++++ .../priv/gettext/en/LC_MESSAGES/default.po | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index bf490e4091..a96252e762 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -199,11 +199,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:253 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:47 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:45 msgid "Cancel" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:137 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:90 msgid "Clear" msgstr "" @@ -220,6 +222,8 @@ msgstr "" #: lib/block_scout_web/templates/address/_tabs.html.eex:42 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:165 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:111 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:133 #: lib/block_scout_web/views/address_view.ex:307 msgid "Code" msgstr "" @@ -325,6 +329,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:146 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:101 msgid "Curl" msgstr "" @@ -339,12 +344,15 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:53 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:188 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:51 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:134 msgid "Description" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:166 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:112 msgid "Details" msgstr "" @@ -386,11 +394,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:211 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:148 msgid "Example Value" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:128 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:81 msgid "Execute" msgstr "" @@ -556,6 +566,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:50 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:16 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:45 msgid "Name" @@ -590,11 +601,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:19 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:17 msgid "POST" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:33 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:31 msgid "Parameters" msgstr "" @@ -659,11 +672,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:173 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:119 msgid "Response Body" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:185 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:131 msgid "Responses" msgstr "" @@ -682,6 +697,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:163 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:109 msgid "Server Response" msgstr "" @@ -890,6 +906,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:40 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:38 msgid "Try it out" 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 107563ea66..367d2a3973 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 @@ -199,11 +199,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:253 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:47 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:45 msgid "Cancel" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:137 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:90 msgid "Clear" msgstr "" @@ -220,6 +222,8 @@ msgstr "" #: lib/block_scout_web/templates/address/_tabs.html.eex:42 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:165 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:187 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:111 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:133 #: lib/block_scout_web/views/address_view.ex:307 msgid "Code" msgstr "" @@ -325,6 +329,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:146 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:101 msgid "Curl" msgstr "" @@ -339,12 +344,15 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:53 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:188 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:51 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:134 msgid "Description" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:8 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:166 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:112 msgid "Details" msgstr "" @@ -386,11 +394,13 @@ msgstr "POA" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:211 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:148 msgid "Example Value" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:128 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:81 msgid "Execute" msgstr "" @@ -556,6 +566,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:50 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:16 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:45 msgid "Name" @@ -590,11 +601,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:19 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:17 msgid "POST" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:33 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:31 msgid "Parameters" msgstr "" @@ -659,11 +672,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:173 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:119 msgid "Response Body" msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:185 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:131 msgid "Responses" msgstr "" @@ -682,6 +697,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:163 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:109 msgid "Server Response" msgstr "" @@ -890,6 +906,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:40 +#: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:38 msgid "Try it out" msgstr "" From 63531a4d723e932ddfb63c571d33f91c6480be58 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 25 Jul 2019 13:41:31 +0300 Subject: [PATCH 014/290] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b621bd681..5dd084b3f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation - [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements - [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty - [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts From 8584a7fc28e84e19d18de9b11933c14d1532697f Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 29 Jul 2019 10:49:10 +0300 Subject: [PATCH 015/290] Disable market history cataloger with indexer --- apps/explorer/config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index fed5124a2a..f20d704135 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -51,7 +51,7 @@ config :explorer, Explorer.KnownTokens, enabled: true, store: :ets config :explorer, Explorer.Integrations.EctoLogger, query_time_ms_threshold: :timer.seconds(2) -config :explorer, Explorer.Market.History.Cataloger, enabled: true +config :explorer, Explorer.Market.History.Cataloger, enabled: System.get_env("DISABLE_INDEXER") != "true" config :explorer, Explorer.Repo, migration_timestamps: [type: :utc_datetime_usec] From c09766e7922be147022c4770bb0c50dd31f6b680 Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 29 Jul 2019 11:09:23 +0300 Subject: [PATCH 016/290] Disable MetadataProcessor with indexer --- apps/explorer/config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index f20d704135..1ceed7c387 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -65,7 +65,7 @@ if System.get_env("METADATA_CONTRACT") && System.get_env("VALIDATORS_CONTRACT") metadata_contract_address: System.get_env("METADATA_CONTRACT"), validators_contract_address: System.get_env("VALIDATORS_CONTRACT") - config :explorer, Explorer.Validator.MetadataProcessor, enabled: true + config :explorer, Explorer.Validator.MetadataProcessor, enabled: System.get_env("DISABLE_INDEXER") != "true" else config :explorer, Explorer.Validator.MetadataProcessor, enabled: false end From 60be9a8a5fc3acf82bc03d914747bd14ea989cbe Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 29 Jul 2019 11:48:12 +0300 Subject: [PATCH 017/290] Add WEBAPP_URL var --- apps/block_scout_web/config/config.exs | 3 ++- .../templates/layout/_footer.html.eex | 2 +- .../templates/layout/_topnav.html.eex | 2 +- .../lib/block_scout_web/views/layout_view.ex | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index 84f60a2842..ff842fd294 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -28,7 +28,8 @@ config :block_scout_web, "EtherChain" => "https://www.etherchain.org/", "Bloxy" => "https://bloxy.info/" }, - other_networks: System.get_env("SUPPORTED_CHAINS") + other_networks: System.get_env("SUPPORTED_CHAINS"), + webapp_url: System.get_env("WEBAPP_URL") config :block_scout_web, BlockScoutWeb.Counters.BlocksIndexedCounter, enabled: true diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex index 9d84836a5a..999a39ed11 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex @@ -3,7 +3,7 @@
    - <%= link to: chain_path(@conn, :show), class: "footer-brand" do %> + <%= link to: webapp_url(@conn), class: "footer-brand" do %> <% end %>
    diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 2b92768e1e..d3779a99bc 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -5,7 +5,7 @@ }
    - <%= link to: chain_path(@conn, :show), class: "navbar-brand", "data-test": "header_logo" do %> + <%= link to: webapp_url(@conn), class: "navbar-brand", "data-test": "header_logo" do %> <% end %> \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex index d8ecb167f1..d14657cc6d 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex @@ -23,9 +23,13 @@
    <%= if not Explorer.Chain.finished_indexing?() do %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 1a99ada8ad..886a88e4c0 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -62,7 +62,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:38 +#: lib/block_scout_web/templates/layout/app.html.eex:42 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -157,7 +157,7 @@ msgid "Block Height: %{height}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:53 +#: lib/block_scout_web/templates/layout/app.html.eex:57 msgid "Block Mined, awaiting import..." msgstr "" @@ -184,7 +184,7 @@ msgid "Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:52 +#: lib/block_scout_web/templates/layout/app.html.eex:56 msgid "Blocks Indexed" msgstr "" @@ -376,7 +376,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_balance_card.html.eex:15 #: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20 -#: lib/block_scout_web/templates/layout/app.html.eex:58 +#: lib/block_scout_web/templates/layout/app.html.eex:62 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29 #: lib/block_scout_web/templates/transaction/overview.html.eex:179 @@ -457,7 +457,7 @@ msgid "IN" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:54 +#: lib/block_scout_web/templates/layout/app.html.eex:58 msgid "Indexing Tokens" msgstr "" @@ -489,7 +489,7 @@ msgid "Inventory" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:55 +#: lib/block_scout_web/templates/layout/app.html.eex:59 msgid "Less than" msgstr "" @@ -510,7 +510,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:31 -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:60 #: lib/block_scout_web/views/address_view.ex:121 #: lib/block_scout_web/views/address_view.ex:121 msgid "Market Cap" @@ -629,7 +629,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:24 -#: lib/block_scout_web/templates/layout/app.html.eex:57 +#: lib/block_scout_web/templates/layout/app.html.eex:61 msgid "Price" 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 735b716ec4..8fd1e1ff2e 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 @@ -62,7 +62,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:38 +#: lib/block_scout_web/templates/layout/app.html.eex:42 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -136,8 +136,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_link.html.eex:2 -#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:29 -#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:40 +#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:28 +#: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:39 msgid "Block #%{number}" msgstr "" @@ -157,7 +157,7 @@ msgid "Block Height: %{height}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:53 +#: lib/block_scout_web/templates/layout/app.html.eex:57 msgid "Block Mined, awaiting import..." msgstr "" @@ -184,7 +184,7 @@ msgid "Blocks" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:52 +#: lib/block_scout_web/templates/layout/app.html.eex:56 msgid "Blocks Indexed" msgstr "" @@ -211,10 +211,10 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37 -#: lib/block_scout_web/templates/address/overview.html.eex:146 -#: lib/block_scout_web/templates/address/overview.html.eex:154 -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:107 -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:115 +#: lib/block_scout_web/templates/address/overview.html.eex:145 +#: lib/block_scout_web/templates/address/overview.html.eex:153 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:114 msgid "Close" msgstr "" @@ -375,12 +375,12 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_balance_card.html.eex:15 -#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:21 -#: lib/block_scout_web/templates/layout/app.html.eex:58 +#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20 +#: lib/block_scout_web/templates/layout/app.html.eex:62 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 -#: lib/block_scout_web/templates/transaction/_tile.html.eex:30 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:29 #: lib/block_scout_web/templates/transaction/overview.html.eex:179 -#: lib/block_scout_web/templates/transaction/overview.html.eex:211 +#: lib/block_scout_web/templates/transaction/overview.html.eex:209 #: lib/block_scout_web/views/wei_helpers.ex:78 msgid "Ether" msgstr "POA" @@ -451,13 +451,13 @@ msgid "Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:39 -#: lib/block_scout_web/templates/transaction/_tile.html.eex:74 +#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:38 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:72 msgid "IN" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:54 +#: lib/block_scout_web/templates/layout/app.html.eex:58 msgid "Indexing Tokens" msgstr "" @@ -489,12 +489,12 @@ msgid "Inventory" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:55 +#: lib/block_scout_web/templates/layout/app.html.eex:59 msgid "Less than" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:239 +#: lib/block_scout_web/templates/transaction/overview.html.eex:237 msgid "Limit" msgstr "" @@ -510,7 +510,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:31 -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:60 #: lib/block_scout_web/views/address_view.ex:121 #: lib/block_scout_web/views/address_view.ex:121 msgid "Market Cap" @@ -578,8 +578,8 @@ msgid "Nonce" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:37 -#: lib/block_scout_web/templates/transaction/_tile.html.eex:70 +#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:36 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:68 msgid "OUT" msgstr "" @@ -629,15 +629,15 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/chain/show.html.eex:24 -#: lib/block_scout_web/templates/layout/app.html.eex:57 +#: lib/block_scout_web/templates/layout/app.html.eex:61 msgid "Price" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/overview.html.eex:33 -#: lib/block_scout_web/templates/address/overview.html.eex:145 +#: lib/block_scout_web/templates/address/overview.html.eex:144 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36 -#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:106 +#: lib/block_scout_web/templates/tokens/overview/_details.html.eex:105 msgid "QR Code" msgstr "" @@ -709,7 +709,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:21 -#: lib/block_scout_web/templates/transaction/_tile.html.eex:34 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:32 #: lib/block_scout_web/templates/transaction/overview.html.eex:84 msgid "TX Fee" msgstr "" @@ -915,7 +915,7 @@ msgid "Unique Token" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:233 +#: lib/block_scout_web/templates/transaction/overview.html.eex:231 msgid "Used" msgstr "" @@ -936,7 +936,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/overview.html.eex:179 -#: lib/block_scout_web/templates/transaction/overview.html.eex:211 +#: lib/block_scout_web/templates/transaction/overview.html.eex:209 msgid "Value" msgstr "" @@ -957,12 +957,12 @@ msgid "View Contract" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/_tile.html.eex:55 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:53 msgid "View Less Transfers" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/_tile.html.eex:54 +#: lib/block_scout_web/templates/transaction/_tile.html.eex:52 msgid "View More Transfers" msgstr "" @@ -1002,7 +1002,7 @@ msgid "Yes" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:113 +#: lib/block_scout_web/templates/address/overview.html.eex:112 msgid "at" msgstr "" @@ -1450,7 +1450,7 @@ msgid "Incoming Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:121 +#: lib/block_scout_web/templates/address/overview.html.eex:120 msgid "Error: Could not determine contract creator." msgstr "" @@ -1513,7 +1513,7 @@ msgid "View All Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:229 +#: lib/block_scout_web/templates/transaction/overview.html.eex:227 msgid "Gas" msgstr "" From 82d6265024fa8c6fd0dd2c747b84a8a145858fd6 Mon Sep 17 00:00:00 2001 From: saneery Date: Tue, 13 Aug 2019 15:23:29 +0300 Subject: [PATCH 154/290] Toggle button view more/less transfers --- .../assets/js/lib/token_transfers_toggle.js | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/token_transfers_toggle.js b/apps/block_scout_web/assets/js/lib/token_transfers_toggle.js index af188ae550..b2f029c57d 100644 --- a/apps/block_scout_web/assets/js/lib/token_transfers_toggle.js +++ b/apps/block_scout_web/assets/js/lib/token_transfers_toggle.js @@ -1,20 +1,17 @@ import $ from 'jquery' -const tokenTransferToggle = (element) => { - const $element = $(element) - const $tokenTransferClose = $element.find("[data-selector='token-transfer-close']") - const $tokenTransferOpen = $element.find("[data-selector='token-transfer-open']") +$(document.body).on('click', '[data-selector="token-transfer-open"]', event => { + const $tokenTransferOpen = event.target + const $parent = $tokenTransferOpen.parentElement + const $tokenTransferClose = $parent.querySelector("[data-selector='token-transfer-close']") + $tokenTransferOpen.classList.add('d-none') + $tokenTransferClose.classList.remove('d-none') +}) - $element.on('show.bs.collapse', () => { - $tokenTransferOpen.addClass('d-none') - $tokenTransferClose.removeClass('d-none') - }) - - $element.on('hide.bs.collapse', () => { - $tokenTransferClose.addClass('d-none') - $tokenTransferOpen.removeClass('d-none') - }) -} - -// Initialize the script scoped for each card. -$("[data-selector='token-transfers-toggle']").each((_index, element) => tokenTransferToggle(element)) +$(document.body).on('click', '[data-selector="token-transfer-close"]', event => { + const $tokenTransferClose = event.target + const $parent = $tokenTransferClose.parentElement + const $tokenTransferOpen = $parent.querySelector("[data-selector='token-transfer-open']") + $tokenTransferClose.classList.add('d-none') + $tokenTransferOpen.classList.remove('d-none') +}) From b4cfcfabcdbbfa21559f579fff7e6793ae049a99 Mon Sep 17 00:00:00 2001 From: saneery Date: Tue, 13 Aug 2019 15:33:20 +0300 Subject: [PATCH 155/290] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade434a9d7..8ad4e7715f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features ### Fixes +- [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button ### Chore From ce139f9db3558e0c5c904090c0fff8e41a668a06 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 13 Aug 2019 15:40:34 +0300 Subject: [PATCH 156/290] fix first page button for uncles and rewards --- .../assets/js/lib/async_listing_load.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/js/lib/async_listing_load.js b/apps/block_scout_web/assets/js/lib/async_listing_load.js index 1c1fec4baa..01d9523433 100644 --- a/apps/block_scout_web/assets/js/lib/async_listing_load.js +++ b/apps/block_scout_web/assets/js/lib/async_listing_load.js @@ -205,7 +205,15 @@ export const elements = { } $el.show() $el.attr('disabled', false) - $el.attr('href', window.location.href.split('?')[0]) + + const urlParams = new URLSearchParams(window.location.search); + const blockParam = urlParams.get('block_type'); + + if (blockParam !== null) { + $el.attr('href', window.location.href.split('?')[0] + "?block_type=" + blockParam) + } else { + $el.attr('href', window.location.href.split('?')[0]) + } } }, '[data-async-listing] [data-page-number]': { From 5fb5df8fbea2ec43f71461acbdf75e2739afe6e5 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 13 Aug 2019 15:44:20 +0300 Subject: [PATCH 157/290] fix eslint issues --- apps/block_scout_web/assets/js/lib/async_listing_load.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/async_listing_load.js b/apps/block_scout_web/assets/js/lib/async_listing_load.js index 01d9523433..941f9abee0 100644 --- a/apps/block_scout_web/assets/js/lib/async_listing_load.js +++ b/apps/block_scout_web/assets/js/lib/async_listing_load.js @@ -206,11 +206,11 @@ export const elements = { $el.show() $el.attr('disabled', false) - const urlParams = new URLSearchParams(window.location.search); - const blockParam = urlParams.get('block_type'); + const urlParams = new URLSearchParams(window.location.search) + const blockParam = urlParams.get('block_type') if (blockParam !== null) { - $el.attr('href', window.location.href.split('?')[0] + "?block_type=" + blockParam) + $el.attr('href', window.location.href.split('?')[0] + '?block_type=' + blockParam) } else { $el.attr('href', window.location.href.split('?')[0]) } From 5ef06ce0b14bfd4329c986c969832e304714066d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 13 Aug 2019 15:45:27 +0300 Subject: [PATCH 158/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade434a9d7..5c567dc426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features ### Fixes +- [#2556](https://github.com/poanetwork/blockscout/issues/2556) - fix first page button for uncles and reorgs ### Chore From afc54d4d273f7ee5850fc3a3b6eb3aace4584ab2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 13 Aug 2019 15:55:56 +0300 Subject: [PATCH 159/290] fix CR issue --- .../lib/block_scout_web/views/api_docs_view.ex | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index 13381f5faf..ac7d4d55ee 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -58,10 +58,6 @@ defmodule BlockScoutWeb.APIDocsView do defp handle_slash(path) do base_url = blockscout_url() - if String.ends_with?(base_url, "/") do - base_url <> path - else - base_url <> "/" <> path - end + Path.join(base_url, path) end end From 1d0d6165c20ade69eadd9c9418a9cea8a94f12da Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 09:38:51 +0300 Subject: [PATCH 160/290] move first page href to variable --- apps/block_scout_web/assets/js/lib/async_listing_load.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/async_listing_load.js b/apps/block_scout_web/assets/js/lib/async_listing_load.js index 941f9abee0..13c4aa7da2 100644 --- a/apps/block_scout_web/assets/js/lib/async_listing_load.js +++ b/apps/block_scout_web/assets/js/lib/async_listing_load.js @@ -208,11 +208,12 @@ export const elements = { const urlParams = new URLSearchParams(window.location.search) const blockParam = urlParams.get('block_type') + const firstPageHref = window.location.href.split('?')[0] if (blockParam !== null) { - $el.attr('href', window.location.href.split('?')[0] + '?block_type=' + blockParam) + $el.attr('href', firstPageHref + '?block_type=' + blockParam) } else { - $el.attr('href', window.location.href.split('?')[0]) + $el.attr('href', firstPageHref) } } }, From f1ec76be7e17bef56c7a45a6f0afe67ce3b6f3ef Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 10:32:49 +0300 Subject: [PATCH 161/290] upgrade absinthe phoenix --- mix.lock | 105 ++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/mix.lock b/mix.lock index 92fd054cb6..c85605b868 100644 --- a/mix.lock +++ b/mix.lock @@ -1,116 +1,111 @@ %{ - "abi": {:hex, :abi, "0.1.12", "87ae04cb09e2308db7b3c350584dc3934de0e308f6a056ba82be5756b081a1ca", [:mix], [{:exth_crypto, "~> 0.1.4", [hex: :exth_crypto, repo: "hexpm", optional: false]}], "hexpm"}, - "abnf2": {:hex, :abnf2, "0.1.2", "6f8792b8ac3288dba5fc889c2bceae9fe78f74e1a7b36bea9726ffaa9d7bef95", [:mix], []}, - "absinthe": {:hex, :absinthe, "1.4.14", "fef224a6aac63d6eaafbc0cb96040a8abcd572275b9b4db69d46329acdcae7c7", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, - "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "0f5127844a9e4e1c5fecb1fcee225894a2af6336", [branch: "master"]}, + "absinthe": {:hex, :absinthe, "1.4.16", "0933e4d9f12652b12115d5709c0293a1bf78a22578032e9ad0dad4efee6b9eb1", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, + "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "4dbb73a25a0935a4d292e63876698e18534d835f", [branch: "master"]}, "absinthe_plug": {:git, "https://github.com/ayrat555/absinthe_plug.git", "cbe1c170e11e60b3b0146b925a1ce6ec562840ce", [branch: "ab-enable-default-query"]}, "absinthe_relay": {:hex, :absinthe_relay, "1.4.6", "ec0e2288994b388556247cf9601245abec785cdf206d6e844f2992d29de21624", [:mix], [{:absinthe, "~> 1.4.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"}, - "accept": {:hex, :accept, "0.3.3", "548ebb6fb2e8b0d170e75bb6123aea6ceecb0189bb1231eeadf52eac08384a97", [:rebar3], [], "hexpm"}, - "artificery": {:hex, :artificery, "0.2.6", "f602909757263f7897130cbd006b0e40514a541b148d366ad65b89236b93497a", [:mix], [], "hexpm"}, + "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm"}, "bcrypt_elixir": {:hex, :bcrypt_elixir, "1.1.1", "6b5560e47a02196ce5f0ab3f1d8265db79a23868c137e973b27afef928ed8006", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, "benchee": {:hex, :benchee, "0.13.2", "30cd4ff5f593fdd218a9b26f3c24d580274f297d88ad43383afe525b1543b165", [:mix], [{:deep_merge, "~> 0.1", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm"}, - "benchee_csv": {:hex, :benchee_csv, "0.8.0", "0ca094677d6e2b2f601b7ee7864b754789ef9d24d079432e5e3d6f4fb83a4d80", [:mix], [{:benchee, "~> 0.12", [hex: :benchee, optional: false]}, {:csv, "~> 2.0", [hex: :csv, optional: false]}]}, - "binary": {:hex, :binary, "0.0.5", "20d816f7274ea34f1b673b4cff2fdb9ebec9391a7a68c349070d515c66b1b2cf", [:mix], []}, + "benchee_csv": {:hex, :benchee_csv, "0.8.0", "0ca094677d6e2b2f601b7ee7864b754789ef9d24d079432e5e3d6f4fb83a4d80", [:mix], [{:benchee, "~> 0.12", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm"}, + "binary": {:hex, :binary, "0.0.5", "20d816f7274ea34f1b673b4cff2fdb9ebec9391a7a68c349070d515c66b1b2cf", [:mix], [], "hexpm"}, "briefly": {:git, "https://github.com/CargoSense/briefly.git", "2526e9674a4e6996137e066a1295ea60962712b8", []}, - "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], []}, + "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"}, "bypass": {:hex, :bypass, "1.0.0", "b78b3dcb832a71aca5259c1a704b2e14b55fd4e1327ff942598b4e7d1a7ad83d", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}], "hexpm"}, "certifi": {:hex, :certifi, "2.3.1", "d0f424232390bf47d82da8478022301c561cf6445b5b5fb6a84d49a9e76d2639", [:rebar3], [{:parse_trans, "3.2.0", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"}, "cldr_utils": {:hex, :cldr_utils, "2.3.0", "e7e8b5ad7494a929c1b620cc489c3aa3f6e7e5299584c1a934bbdb56d1a53c70", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm"}, - "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], []}, + "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"}, "comeonin": {:hex, :comeonin, "4.1.2", "3eb5620fd8e35508991664b4c2b04dd41e52f1620b36957be837c1d7784b7592", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"}, "con_cache": {:hex, :con_cache, "0.13.1", "047e097ab2a8c6876e12d0c29e29a86d487b592df97b98e3e2abedad574e215d", [:mix], [], "hexpm"}, - "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []}, + "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"}, "cors_plug": {:hex, :cors_plug, "2.0.0", "238ddb479f92b38f6dc1ae44b8d81f0387f9519101a6da442d543ab70ee0e482", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, - "cowboy": {:hex, :cowboy, "2.6.1", "f2e06f757c337b3b311f9437e6e072b678fcd71545a7b2865bdaa154d078593f", [:rebar3], [{:cowlib, "~> 2.7.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"}, - "cowlib": {:hex, :cowlib, "2.7.0", "3ef16e77562f9855a2605900cedb15c1462d76fb1be6a32fc3ae91973ee543d2", [:rebar3], [], "hexpm"}, + "cowboy": {:hex, :cowboy, "2.6.3", "99aa50e94e685557cad82e704457336a453d4abcb77839ad22dbe71f311fcc06", [:rebar3], [{:cowlib, "~> 2.7.3", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"}, + "cowlib": {:hex, :cowlib, "2.7.3", "a7ffcd0917e6d50b4d5fb28e9e2085a0ceb3c97dea310505f7460ff5ed764ce9", [:rebar3], [], "hexpm"}, "credo": {:hex, :credo, "1.1.2", "02b6422f3e659eb74b05aca3c20c1d8da0119a05ee82577a82e6c2938bf29f81", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"}, - "csv": {:hex, :csv, "2.1.1", "a4c1a7c30d2151b6e4976cb2f52c0a1d49ec965afb737ed84a684bc4284d1627", [:mix], [{:parallel_stream, "~> 1.0.4", [hex: :parallel_stream, optional: false]}]}, + "csv": {:hex, :csv, "2.3.1", "9ce11eff5a74a07baf3787b2b19dd798724d29a9c3a492a41df39f6af686da0e", [:mix], [{:parallel_stream, "~> 1.0.4", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm"}, "dataloader": {:hex, :dataloader, "1.0.6", "fb724d6d3fb6acb87d27e3b32dea3a307936ad2d245faf9cf5221d1323d6a4ba", [:mix], [{:ecto, ">= 0.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"}, "db_connection": {:hex, :db_connection, "2.1.1", "a51e8a2ee54ef2ae6ec41a668c85787ed40cb8944928c191280fe34c15b76ae5", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, "decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"}, "decorator": {:hex, :decorator, "1.3.0", "6203dbd6e4e519a21a079e2a74e50fddaf03e80be22711b92eb4cd410173abea", [:mix], [], "hexpm"}, "deep_merge": {:hex, :deep_merge, "0.2.0", "c1050fa2edf4848b9f556fba1b75afc66608a4219659e3311d9c9427b5b680b3", [:mix], [], "hexpm"}, - "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], []}, - "distillery": {:hex, :distillery, "2.0.12", "6e78fe042df82610ac3fa50bd7d2d8190ad287d120d3cd1682d83a44e8b34dfb", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm"}, - "earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm"}, + "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm"}, + "earmark": {:hex, :earmark, "1.3.5", "0db71c8290b5bc81cb0101a2a507a76dca659513984d683119ee722828b424f6", [:mix], [], "hexpm"}, "ecto": {:hex, :ecto, "3.1.7", "fa21d06ef56cdc2fdaa62574e8c3ba34a2751d44ea34c30bc65f0728421043e5", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ecto_sql": {:hex, :ecto_sql, "3.1.6", "1e80e30d16138a729c717f73dcb938590bcdb3a4502f3012414d0cbb261045d8", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0 or ~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, - "elixir_make": {:hex, :elixir_make, "0.4.2", "332c649d08c18bc1ecc73b1befc68c647136de4f340b548844efc796405743bf", [:mix], [], "hexpm"}, + "elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm"}, "ex_abi": {:hex, :ex_abi, "0.1.18", "19db9bffdd201edbdff97d7dd5849291218b17beda045c1b76bff5248964f37d", [:mix], [{:exth_crypto, "~> 0.1.4", [hex: :exth_crypto, repo: "hexpm", optional: false]}], "hexpm"}, "ex_cldr": {:hex, :ex_cldr, "2.7.2", "d79a1af6ed12630a15175d2b88d4381b22db5d6f835c5da8de132f0cf712b233", [:mix], [{:cldr_utils, "~> 2.1", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"}, "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.3.0", "bffae489416b8b05d4683403263f5d62aae17de70c24ff915a533541fea514de", [:mix], [{:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.2.0", "b99f8752d098fc6ba5f083bbd0b25d0d01e36b0042155cf6abd5f205306ba849", [:mix], [{:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.6", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.6.4", "5b1ac8451f889576bb29dee70412de1170974298727ab944aa4d17e91bdd3472", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.3", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ex_cldr_units": {:hex, :ex_cldr_units, "2.5.1", "0e65067a22a7c5146266c313d6333c2700868c32aa6d536f47c6c0d84aac3ac1", [:mix], [{:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.2", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.6", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, - "ex_doc": {:hex, :ex_doc, "0.19.2", "6f4081ccd9ed081b6dc0bd5af97a41e87f5554de469e7d76025fba535180565f", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, + "ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, "ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"}, "ex_rlp": {:hex, :ex_rlp, "0.5.2", "7f4ce7bd55e543c054ce6d49629b01e9833c3462e3d547952be89865f39f2c58", [:mix], [], "hexpm"}, "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm"}, - "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], []}, + "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm"}, "excoveralls": {:git, "https://github.com/KronicDeth/excoveralls.git", "0a859b68851eeba9b43eba59fbc8f9098299cfe1", [branch: "circle-workflows"]}, - "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]}, + "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm"}, "exth_crypto": {:hex, :exth_crypto, "0.1.6", "8e636a9bcb75d8e32451be96e547a495121ed2178d078db294edb0f81f7cf2e8", [:mix], [{:binary, "~> 0.0.4", [hex: :binary, repo: "hexpm", optional: false]}, {:keccakf1600, "~> 2.0.0", [hex: :keccakf1600_orig, repo: "hexpm", optional: false]}, {:libsecp256k1, "~> 0.1.9", [hex: :libsecp256k1, repo: "hexpm", optional: false]}], "hexpm"}, - "exvcr": {:hex, :exvcr, "0.10.3", "1ae3b97560430acfa88ebc737c85b2b7a9dbacd8a2b26789a19718b51ae3522c", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, - "file_system": {:hex, :file_system, "0.2.6", "fd4dc3af89b9ab1dc8ccbcc214a0e60c41f34be251d9307920748a14bf41f1d3", [:mix], [], "hexpm"}, + "exvcr": {:hex, :exvcr, "0.10.1", "cb266e5cc0d4fef12572ce6673d13f97aa3c302911010d64d51cee0690f566d1", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, + "file_system": {:hex, :file_system, "0.2.7", "e6f7f155970975789f26e77b8b8d8ab084c59844d8ecfaf58cbda31c494d14aa", [:mix], [], "hexpm"}, "floki": {:hex, :floki, "0.20.4", "be42ac911fece24b4c72f3b5846774b6e61b83fe685c2fc9d62093277fb3bc86", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}, {:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"}, "flow": {:hex, :flow, "0.14.3", "0d92991fe53035894d24aa8dec10dcfccf0ae00c4ed436ace3efa9813a646902", [:mix], [{:gen_stage, "~> 0.14.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm"}, - "gen_stage": {:hex, :gen_stage, "0.14.1", "9d46723fda072d4f4bb31a102560013f7960f5d80ea44dcb96fd6304ed61e7a4", [:mix], [], "hexpm"}, + "gen_stage": {:hex, :gen_stage, "0.14.2", "6a2a578a510c5bfca8a45e6b27552f613b41cf584b58210f017088d3d17d0b14", [:mix], [], "hexpm"}, "gettext": {:hex, :gettext, "0.16.1", "e2130b25eebcbe02bb343b119a07ae2c7e28bd4b146c4a154da2ffb2b3507af2", [:mix], [], "hexpm"}, "hackney": {:hex, :hackney, "1.13.0", "24edc8cd2b28e1c652593833862435c80661834f6c9344e84b6a2255e7aeef03", [:rebar3], [{:certifi, "2.3.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.2", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, - "html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], []}, - "httpoison": {:hex, :httpoison, "1.5.0", "71ae9f304bdf7f00e9cd1823f275c955bdfc68282bc5eb5c85c3a9ade865d68e", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, + "html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], [], "hexpm"}, + "httpoison": {:hex, :httpoison, "1.0.0", "1f02f827148d945d40b24f0b0a89afe40bfe037171a6cf70f2486976d86921cd", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "5.1.2", "e21cb58a09f0228a9e0b95eaa1217f1bcfc31a1aaa6e1fdf2f53a33f7dbd9494", [:rebar3], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"}, "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, - "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], []}, - "junit_formatter": {:hex, :junit_formatter, "3.0.0", "13950d944dbd295da7d8cc4798b8faee808a8bb9b637c88069954eac078ac9da", [:mix], [], "hexpm"}, - "keccakf1600": {:hex, :keccakf1600_orig, "2.0.0", "0a7217ddb3ee8220d449bbf7575ec39d4e967099f220a91e3dfca4dbaef91963", [:rebar3], []}, + "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm"}, + "junit_formatter": {:hex, :junit_formatter, "3.0.1", "4ed76a50886717a6d683a978cec775abdcb88d9d51cfddd3d8fbf8e6af4625da", [:mix], [], "hexpm"}, + "keccakf1600": {:hex, :keccakf1600_orig, "2.0.0", "0a7217ddb3ee8220d449bbf7575ec39d4e967099f220a91e3dfca4dbaef91963", [:rebar3], [], "hexpm"}, "libsecp256k1": {:hex, :libsecp256k1, "0.1.10", "d27495e2b9851c7765129b76c53b60f5e275bd6ff68292c50536bf6b8d091a4d", [:make, :mix], [{:mix_erlang_tasks, "0.1.0", [hex: :mix_erlang_tasks, repo: "hexpm", optional: false]}], "hexpm"}, - "logger_file_backend": {:hex, :logger_file_backend, "0.0.10", "876f9f84ae110781207c54321ffbb62bebe02946fe3c13f0d7c5f5d8ad4fa910", [:mix], [], "hexpm"}, - "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, - "math": {:hex, :math, "0.3.0", "e14e7291115201cb155a3567e66d196bf5088a6f55b030d598107d7ae934a11c", [:mix], []}, - "meck": {:hex, :meck, "0.8.12", "1f7b1a9f5d12c511848fec26bbefd09a21e1432eadb8982d9a8aceb9891a3cf2", [:rebar3], [], "hexpm"}, + "logger_file_backend": {:hex, :logger_file_backend, "0.0.11", "3bbc5f31d3669e8d09d7a9443e86056fae7fc18e45c6f748c33b8c79a7e147a1", [:mix], [], "hexpm"}, + "makeup": {:hex, :makeup, "1.0.0", "671df94cf5a594b739ce03b0d0316aa64312cee2574b6a44becb83cd90fb05dc", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, + "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, + "math": {:hex, :math, "0.3.0", "e14e7291115201cb155a3567e66d196bf5088a6f55b030d598107d7ae934a11c", [:mix], [], "hexpm"}, + "meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm"}, "memento": {:hex, :memento, "0.3.1", "b2909390820550d8b90b68ec96f9e15ff8a45a28b6f97fa4a62ef50e87c2f9d9", [:mix], [], "hexpm"}, - "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []}, + "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"}, "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm"}, "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"}, "mix_erlang_tasks": {:hex, :mix_erlang_tasks, "0.1.0", "36819fec60b80689eb1380938675af215565a89320a9e29c72c70d97512e4649", [:mix], [], "hexpm"}, "mochiweb": {:hex, :mochiweb, "2.18.0", "eb55f1db3e6e960fac4e6db4e2db9ec3602cc9f30b86cd1481d56545c3145d2e", [:rebar3], [], "hexpm"}, - "mock": {:hex, :mock, "0.3.2", "e98e998fd76c191c7e1a9557c8617912c53df3d4a6132f561eb762b699ef59fa", [:mix], [{:meck, "~> 0.8.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, - "mox": {:hex, :mox, "0.4.0", "7f120840f7d626184a3d65de36189ca6f37d432e5d63acd80045198e4c5f7e6e", [:mix], [], "hexpm"}, - "msgpax": {:hex, :msgpax, "2.2.2", "559a07806bbe5fdd31e4597455be030bd96356f7a621ca9eed832747c83bfb67", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm"}, + "mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, + "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"}, + "msgpax": {:hex, :msgpax, "2.2.4", "7b3790ef684089076b63c0f08c2f4b079c6311daeb006b69e4ed2bf67518291e", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm"}, "nimble_csv": {:hex, :nimble_csv, "0.6.0", "a3673f26d41f986774fe6060e309615343d3cb83a6d435754d8b1fdbd5764879", [:mix], [], "hexpm"}, - "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"}, + "nimble_parsec": {:hex, :nimble_parsec, "0.5.1", "c90796ecee0289dbb5ad16d3ad06f957b0cd1199769641c961cfe0b97db190e0", [:mix], [], "hexpm"}, "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm"}, - "parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], []}, + "parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], [], "hexpm"}, "parse_trans": {:hex, :parse_trans, "3.2.0", "2adfa4daf80c14dc36f522cf190eb5c4ee3e28008fc6394397c16f62a26258c2", [:rebar3], [], "hexpm"}, - "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"}, + "phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, "phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, - "phoenix_form_awesomplete": {:hex, :phoenix_form_awesomplete, "0.1.4", "4af0603d8d41ca638e70f74d6defff331e4db106dd85f75f125579ca27bd8b64", [:mix], [{:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm"}, - "phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, - "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.0", "3bb31a9fbd40ffe8652e60c8660dffd72dd231efcdf49b744fb75b9ef7db5dd2", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"}, - "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm"}, + "phoenix_form_awesomplete": {:hex, :phoenix_form_awesomplete, "0.1.5", "d09aade160b584e3428e1e095645482396f17bddda4f566f1118f12d2598d11c", [:mix], [{:phoenix_html, "~> 2.10", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm"}, + "phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, + "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"}, + "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"}, "plug": {:hex, :plug, "1.8.3", "12d5f9796dc72e8ac9614e94bda5e51c4c028d0d428e9297650d09e15a684478", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"}, - "plug_cowboy": {:hex, :plug_cowboy, "2.0.1", "d798f8ee5acc86b7d42dbe4450b8b0dadf665ce588236eb0a751a132417a980e", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, + "plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"}, - "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []}, + "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"}, "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"}, "postgrex": {:hex, :postgrex, "0.15.0", "dd5349161019caeea93efa42f9b22f9d79995c3a86bdffb796427b4c9863b0f0", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, - "prometheus": {:hex, :prometheus, "4.2.0", "06c58bfdfe28d3168b926da614cb9a6d39593deebde648a5480e32dfa3c370e9", [:mix, :rebar3], [], "hexpm"}, + "prometheus": {:hex, :prometheus, "4.4.1", "1e96073b3ed7788053768fea779cbc896ddc3bdd9ba60687f2ad50b252ac87d6", [:mix, :rebar3], [], "hexpm"}, "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"}, - "prometheus_ex": {:hex, :prometheus_ex, "3.0.3", "5d722263bb1f7a9b1d02554de42e61ea672b4e3c07c3f74e23ce35ab5e111cfa", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"}, - "prometheus_phoenix": {:hex, :prometheus_phoenix, "1.2.1", "964a74dfbc055f781d3a75631e06ce3816a2913976d1df7830283aa3118a797a", [:mix], [{:phoenix, "~> 1.3", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"}, + "prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"}, + "prometheus_phoenix": {:hex, :prometheus_phoenix, "1.3.0", "c4b527e0b3a9ef1af26bdcfbfad3998f37795b9185d475ca610fe4388fdd3bb5", [:mix], [{:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"}, "prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm"}, - "prometheus_process_collector": {:hex, :prometheus_process_collector, "1.4.0", "6dbd39e3165b9ef1c94a7a820e9ffe08479f949dcdd431ed4aaea7b250eebfde", [:rebar3], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"}, - "qrcode": {:hex, :qrcode, "0.1.4", "544dc67ba42eed5ebce3d2a691d053387937740561d251f83f0a067917fae2dc", [:mix], [], "hexpm"}, + "prometheus_process_collector": {:hex, :prometheus_process_collector, "1.4.3", "657386e8f142fc817347d95c1f3a05ab08710f7df9e7f86db6facaed107ed929", [:rebar3], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"}, + "qrcode": {:hex, :qrcode, "0.1.5", "551271830515c150f34568345b060c625deb0e6691db2a01b0a6de3aafc93886", [:mix], [], "hexpm"}, "que": {:hex, :que, "0.10.1", "788ed0ec92ed69bdf9cfb29bf41a94ca6355b8d44959bd0669cf706e557ac891", [:mix], [{:ex_utils, "~> 0.1.6", [hex: :ex_utils, repo: "hexpm", optional: false]}, {:memento, "~> 0.3.0", [hex: :memento, repo: "hexpm", optional: false]}], "hexpm"}, "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"}, - "set_locale": {:git, "https://github.com/minifast/set_locale.git", "da9ae029642bc0fbd9212c2aaf86c0adca70c084", [branch: "master"]}, - "sobelow": {:hex, :sobelow, "0.7.4", "228cc6185b448b63ecc88429b43e864e8dd570e8e09f2d04b3aa71894db1bdbb", [:mix], [], "hexpm"}, + "sobelow": {:hex, :sobelow, "0.8.0", "a3ec73e546dfde19f14818e5000c418e3f305d9edb070e79dd391de0ae1cd1ea", [:mix], [], "hexpm"}, "spandex": {:git, "https://github.com/spandex-project/spandex.git", "92992b4aaf3d92e031c2417ff2e6c9e94d27fe36", [branch: "allow-setting-trace-key"]}, "spandex_datadog": {:hex, :spandex_datadog, "0.4.0", "75113a73e843123074886a2e31994af07d6e0632749a8d97e9ca6157b120c287", [:mix], [{:msgpax, "~> 2.2.1", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 2.3", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm"}, "spandex_ecto": {:hex, :spandex_ecto, "0.4.0", "deaeaddc11a35f1c551206c53d09bb93a0da5808dbef751430e465c8c7de01d3", [:mix], [{:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm"}, - "spandex_phoenix": {:hex, :spandex_phoenix, "0.3.1", "9cb9a4a9f2161f171d9df9afa1289a0d037abbbeecabae674f959b57f106f201", [:mix], [{:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm"}, + "spandex_phoenix": {:hex, :spandex_phoenix, "0.3.2", "e81889d80852a895cf62ce2e25181b15766d21e8647962e0a4458414b935feb3", [:mix], [{:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"}, "telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"}, "timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"}, From ab635a6a33df74350d898b9989afb6df6f5d30cc Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 10:41:56 +0300 Subject: [PATCH 162/290] fix sobelow --- apps/block_scout_web/.sobelow-conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/.sobelow-conf b/apps/block_scout_web/.sobelow-conf index 73cbb5ae98..51d8b758cb 100644 --- a/apps/block_scout_web/.sobelow-conf +++ b/apps/block_scout_web/.sobelow-conf @@ -5,5 +5,5 @@ router: "lib/block_scout_web/router.ex", exit: "low", format: "compact", - ignore: ["Config.Headers"] + ignore: ["Config.Headers", "Config.CSWH"] ] From 8b5cc7bb73f8a46adda747808c3d0405729c7eb2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 10:49:08 +0300 Subject: [PATCH 163/290] fix dialyzer --- .dialyzer-ignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.dialyzer-ignore b/.dialyzer-ignore index de105bbd51..86584c2cb5 100644 --- a/.dialyzer-ignore +++ b/.dialyzer-ignore @@ -11,3 +11,5 @@ apps/explorer/lib/explorer/repo/prometheus_logger.ex:8: The call 'Elixir.System' apps/block_scout_web/lib/block_scout_web/views/layout_view.ex:175: The call 'Elixir.Poison.Parser':'parse!'(any(),#{'keys':='atoms!'}) will never return since the success typing is (binary() | maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | []),[{atom(),_}]) -> 'false' | 'nil' | 'true' | binary() | ['false' | 'nil' | 'true' | binary() | [any()] | number() | map()] | number() | map() and the contract is (iodata(),'Elixir.Keyword':t()) -> t() apps/explorer/lib/explorer/smart_contract/publisher_worker.ex:6: The pattern 'false' can never match the type 'true' apps/explorer/lib/explorer/smart_contract/publisher_worker.ex:6: The test 5 == 'infinity' can never evaluate to 'true' +lib/block_scout_web/router.ex:1 +lib/phoenix/router.ex:324 \ No newline at end of file From 8ae4083e10058681e511231b2473f2c0e2a3a131 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 11:02:08 +0300 Subject: [PATCH 164/290] fix tests --- apps/block_scout_web/config/config.exs | 2 +- apps/block_scout_web/lib/block_scout_web/application.ex | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index 38f506e854..0126a7d410 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -42,7 +42,7 @@ config :block_scout_web, BlockScoutWeb.Endpoint, path: System.get_env("NETWORK_PATH") || "/" ], render_errors: [view: BlockScoutWeb.ErrorView, accepts: ~w(html json)], - pubsub: [name: BlockScoutWeb.PubSub, adapter: Phoenix.PubSub.PG2] + pubsub: [name: BlockScoutWeb.PubSub] config :block_scout_web, BlockScoutWeb.Tracer, service: :block_scout_web, diff --git a/apps/block_scout_web/lib/block_scout_web/application.ex b/apps/block_scout_web/lib/block_scout_web/application.ex index a9c5021846..61cb9efb3f 100644 --- a/apps/block_scout_web/lib/block_scout_web/application.ex +++ b/apps/block_scout_web/lib/block_scout_web/application.ex @@ -18,6 +18,7 @@ defmodule BlockScoutWeb.Application do # Define workers and child supervisors to be supervised children = [ # Start the endpoint when the application starts + {Phoenix.PubSub.PG2, name: BlockScoutWeb.PubSub, fastlane: Phoenix.Channel.Server}, supervisor(Endpoint, []), supervisor(Absinthe.Subscription, [Endpoint]), {RealtimeEventHandler, name: RealtimeEventHandler}, From d19aecdf4a420c211b7e727b01a2b6d1bc9bfe3f Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 11:12:25 +0300 Subject: [PATCH 165/290] run the introspection query on a schema. --- apps/block_scout_web/test/test_helper.exs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs index 92b0f1f929..cf64b94ffd 100644 --- a/apps/block_scout_web/test/test_helper.exs +++ b/apps/block_scout_web/test/test_helper.exs @@ -18,4 +18,6 @@ Mox.defmock(Explorer.ExchangeRates.Source.TestSource, for: Explorer.ExchangeRate Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, :manual) +Absinthe.Test.prime(BlockScoutWeb.Schema) + Mox.defmock(EthereumJSONRPC.Mox, for: EthereumJSONRPC.Transport) From 94800be24a6bf3e13d65cd522805b673a2a46fd8 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 12:08:24 +0300 Subject: [PATCH 166/290] configur pubsub for tests --- apps/block_scout_web/config/test.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/config/test.exs b/apps/block_scout_web/config/test.exs index 6fcd9c18a9..98d143fe78 100644 --- a/apps/block_scout_web/config/test.exs +++ b/apps/block_scout_web/config/test.exs @@ -7,7 +7,8 @@ config :block_scout_web, :sql_sandbox, true config :block_scout_web, BlockScoutWeb.Endpoint, http: [port: 4002], secret_key_base: "27Swe6KtEtmN37WyEYRjKWyxYULNtrxlkCEKur4qoV+Lwtk8lafsR16ifz1XBBYj", - server: true + server: true, + pubsub: [name: BlockScoutWeb.PubSub] config :block_scout_web, BlockScoutWeb.Tracer, disabled?: false From 9f5265476f8e8940b766750081b97837f09f1801 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 14 Aug 2019 12:21:46 +0300 Subject: [PATCH 167/290] Add ERC-721 type token to the doc --- apps/block_scout_web/lib/block_scout_web/etherscan.ex | 8 ++++++++ 1 file changed, 8 insertions(+) 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 53ae267916..867b56e746 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -165,6 +165,14 @@ defmodule BlockScoutWeb.Etherscan do "decimals" => "18", "symbol" => "ET", "type" => "ERC-20" + }, + %{ + "balance" => "1", + "contractAddress" => "0x0000000000000000000000000000000000000001", + "name" => "Example ERC-721 Token", + "decimals" => "18", + "symbol" => "ET7", + "type" => "ERC-721" } ] } From 44d9818c9342427c9fcbcb566deb0d73c943e1f4 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 12:31:06 +0300 Subject: [PATCH 168/290] debug pubsub --- .../block_scout_web/schema/subscription/token_transfers_test.exs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs index 878b8b84fe..52cec46bf0 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs +++ b/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs @@ -51,6 +51,7 @@ defmodule BlockScoutWeb.Schema.Subscription.TokenTransfersTest do end test "ignores irrelevant tokens", %{socket: socket} do + IO.inspect(Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)) transaction = insert(:transaction) [token_transfer1, token_transfer2] = insert_list(2, :token_transfer, transaction: transaction) address_hash1 = to_string(token_transfer1.token_contract_address_hash) From 004921c3ff3a4f2d74abb61c1e13c8035797d51e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 12:39:02 +0300 Subject: [PATCH 169/290] fix tests --- .../schema/subscription/token_transfers_test.exs | 1 - .../block_scout_web/views/api_docs_view_test.exs | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs index 52cec46bf0..878b8b84fe 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs +++ b/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs @@ -51,7 +51,6 @@ defmodule BlockScoutWeb.Schema.Subscription.TokenTransfersTest do end test "ignores irrelevant tokens", %{socket: socket} do - IO.inspect(Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)) transaction = insert(:transaction) [token_transfer1, token_transfer2] = insert_list(2, :token_transfer, transaction: transaction) address_hash1 = to_string(token_transfer1.token_contract_address_hash) diff --git a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs index 434f43d31b..7583aeaa4f 100644 --- a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs @@ -30,6 +30,14 @@ defmodule BlockScoutWeb.ApiDocsViewTest do end describe "api_url/1" do + setup do + original = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint) + + on_exit(fn -> Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, original) end) + + :ok + end + test "adds slash before path" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] @@ -48,6 +56,14 @@ defmodule BlockScoutWeb.ApiDocsViewTest do end describe "eth_rpc_api_url/1" do + setup do + original = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint) + + on_exit(fn -> Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, original) end) + + :ok + end + test "adds slash before path" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] From 39deac9817ad2fd43f580b83744037261cb72931 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 12:40:23 +0300 Subject: [PATCH 170/290] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c0b8b21a..d07b415d69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### Features ### Fixes -- [#2556](https://github.com/poanetwork/blockscout/issues/2556) - fix first page button for uncles and reorgs +- [#2564](https://github.com/poanetwork/blockscout/issues/2564) - fix first page button for uncles and reorgs ### Chore From 2cb60eaaca96dc1acb6005466b62fd7a25503fa2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:16:30 +0300 Subject: [PATCH 171/290] fix remaining test --- .../features/address_contract_verification_test.exs | 12 +++++++----- .../features/pages/contract_verify_page.ex | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs b/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs index 15587cdc93..1a82a6dedd 100644 --- a/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs +++ b/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs @@ -49,17 +49,19 @@ defmodule BlockScoutWeb.AddressContractVerificationTest do test "with invalid data shows error messages", %{session: session, bypass: bypass} do Bypass.expect(bypass, fn conn -> Conn.resp(conn, 200, solc_bin_versions()) end) + address = insert(:address) + session - |> ContractVerifyPage.visit_page("0x1e0eaa06d02f965be2dfe0bc9ff52b2d82133461") + |> ContractVerifyPage.visit_page(address) |> ContractVerifyPage.fill_form(%{ - contract_name: "", - version: nil, - optimization: nil, + contract_name: "name", + version: "default", + optimization: "true", source_code: "", evm_version: "byzantium" }) |> ContractVerifyPage.verify_and_publish() - |> assert_has(ContractVerifyPage.validation_error()) + |> ContractVerifyPage.has_message?("There was an error validating your contract, please try again.") end defp solc_bin_versions do diff --git a/apps/block_scout_web/test/block_scout_web/features/pages/contract_verify_page.ex b/apps/block_scout_web/test/block_scout_web/features/pages/contract_verify_page.ex index 56c2621920..89a4283efc 100644 --- a/apps/block_scout_web/test/block_scout_web/features/pages/contract_verify_page.ex +++ b/apps/block_scout_web/test/block_scout_web/features/pages/contract_verify_page.ex @@ -48,6 +48,10 @@ defmodule BlockScoutWeb.ContractVerifyPage do css("[data-test='contract-source-code-error']") end + def has_message?(session, message) do + String.contains?(page_source(session), message) + end + def verify_and_publish(session) do click(session, button("Verify & publish")) end From cd9ae7348934b70551201fafd32abc4fe5aec408 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:19:28 +0300 Subject: [PATCH 172/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b2e328f1..f5fc29d3d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixes ### Chore +- [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix ## 2.0.3-beta From a798e77b72a4fee62a9ad7ef281bea44583eb93b Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:24:56 +0300 Subject: [PATCH 173/290] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d07b415d69..270efb3e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### Features ### Fixes -- [#2564](https://github.com/poanetwork/blockscout/issues/2564) - fix first page button for uncles and reorgs +- [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs ### Chore From 56dd21f74af2406e1459c38dfa0637ef0ad7bac0 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:44:30 +0300 Subject: [PATCH 174/290] filter pending token transfers --- apps/explorer/lib/explorer/chain/token_transfer.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex index 905d576aa1..51951969d3 100644 --- a/apps/explorer/lib/explorer/chain/token_transfer.ex +++ b/apps/explorer/lib/explorer/chain/token_transfer.ex @@ -129,7 +129,7 @@ defmodule Explorer.Chain.TokenTransfer do query = from( tt in TokenTransfer, - where: tt.token_contract_address_hash == ^token_address_hash, + where: tt.token_contract_address_hash == ^token_address_hash and not is_nil(^tt.block_number), preload: [{:transaction, :block}, :token, :from_address, :to_address], order_by: [desc: tt.block_number, desc: tt.log_index] ) From 6c07a7635bef717978a42b0f086b4bbb57303d7d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:46:19 +0300 Subject: [PATCH 175/290] use token transfer block number --- .../templates/tokens/transfer/_token_transfer.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex index 0389a235cb..5b8959f0a3 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex @@ -37,7 +37,7 @@ <%= link( gettext("Block #%{number}", number: @transfer.block_number), - to: block_path(BlockScoutWeb.Endpoint, :show, @transfer.transaction.block_number) + to: block_path(BlockScoutWeb.Endpoint, :show, @transfer.block_number) ) %> From c8fc868afa8857597acac9b8a7316a7be984d409 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:48:39 +0300 Subject: [PATCH 176/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b2e328f1..3ae4cb39ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features ### Fixes +- [#2568](https://github.com/poanetwork/blockscout/pull/2568) - filter pending token transfers ### Chore From 5457bd3057da775bbfa5d68647426b93c1f7b02d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 13:49:28 +0300 Subject: [PATCH 177/290] fix build --- apps/explorer/lib/explorer/chain/token_transfer.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex index 51951969d3..2aa291cb6f 100644 --- a/apps/explorer/lib/explorer/chain/token_transfer.ex +++ b/apps/explorer/lib/explorer/chain/token_transfer.ex @@ -129,7 +129,7 @@ defmodule Explorer.Chain.TokenTransfer do query = from( tt in TokenTransfer, - where: tt.token_contract_address_hash == ^token_address_hash and not is_nil(^tt.block_number), + where: tt.token_contract_address_hash == ^token_address_hash and not is_nil(tt.block_number), preload: [{:transaction, :block}, :token, :from_address, :to_address], order_by: [desc: tt.block_number, desc: tt.log_index] ) From 977601172940191fa1cbd9a6275a4f28b8423909 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 14:53:41 +0300 Subject: [PATCH 178/290] fix test --- apps/explorer/test/explorer/chain_test.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index 234252dbe4..f49be6da4e 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -3896,8 +3896,8 @@ defmodule Explorer.ChainTest do balances = Chain.address_to_balances_by_day(address.hash) assert balances == [ - %{date: today |> NaiveDateTime.to_date() |> Date.to_string(), value: Decimal.new("1E-15")}, - %{date: yesterday |> NaiveDateTime.to_date() |> Date.to_string(), value: Decimal.new("1E-15")} + %{date: yesterday |> NaiveDateTime.to_date() |> Date.to_string(), value: Decimal.new("1E-15")}, + %{date: today |> NaiveDateTime.to_date() |> Date.to_string(), value: Decimal.new("1E-15")} ] end end From 4c3317820ce7aff6faa4536097fb5132298b6fbb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 16:09:11 +0300 Subject: [PATCH 179/290] do not fetch emission rewards for transactions csv exporter --- apps/explorer/lib/explorer/chain.ex | 2 +- .../lib/explorer/chain/address_transaction_csv_exporter.ex | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 424636f005..0b09fadc7d 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -248,7 +248,7 @@ defmodule Explorer.Chain do end end - defp address_to_transactions_without_rewards(address_hash, paging_options, options) do + def address_to_transactions_without_rewards(address_hash, paging_options, options) do direction = Keyword.get(options, :direction) necessity_by_association = Keyword.get(options, :necessity_by_association, %{}) diff --git a/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex b/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex index 64df1c7e59..0196de3bc0 100644 --- a/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex +++ b/apps/explorer/lib/explorer/chain/address_transaction_csv_exporter.ex @@ -42,9 +42,8 @@ defmodule Explorer.Chain.AddressTransactionCsvExporter do end defp fetch_all_transactions(address_hash, paging_options, acc \\ []) do - options = Keyword.merge(@necessity_by_association, paging_options: paging_options) - - transactions = Chain.address_to_transactions_with_rewards(address_hash, options) + transactions = + Chain.address_to_transactions_without_rewards(address_hash, paging_options, @necessity_by_association) new_acc = transactions ++ acc From 522c2292db36046e71f81622cad69277d9fb6b84 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 14 Aug 2019 16:10:59 +0300 Subject: [PATCH 180/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d165881076..530ae0add0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features ### Fixes +- [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter - [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs - [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records From b52d10b22acedf72848b360b068333904de8d8d0 Mon Sep 17 00:00:00 2001 From: pasqu4le Date: Thu, 1 Aug 2019 18:11:10 +0200 Subject: [PATCH 181/290] Add generic Ordered Cache behaviour and implementation Problem: multiple caches exist to keep a page of the most recent `n` elements. More are to be implemented, so it would be good to abstract their implementation. Solution: add a behaviour and a macro (providing an implementation) to create this type of caches. Redefine the existing ones using the new macro. --- CHANGELOG.md | 1 + .../api/v1/health_controller_test.exs | 4 +- .../block_scout_web/test/support/conn_case.ex | 4 +- .../test/support/feature_case.ex | 4 +- apps/explorer/lib/explorer/application.ex | 4 +- apps/explorer/lib/explorer/chain.ex | 14 +- .../lib/explorer/chain/cache/blocks.ex | 90 +---- .../lib/explorer/chain/cache/transactions.ex | 153 +------- .../lib/explorer/chain/ordered_cache.ex | 326 ++++++++++++++++++ .../test/explorer/chain/cache/blocks_test.exs | 37 +- .../market/market_history_cache_test.exs | 4 +- .../test/explorer/market/market_test.exs | 8 +- apps/explorer/test/support/data_case.ex | 8 +- apps/indexer/lib/indexer/block/fetcher.ex | 2 +- 14 files changed, 391 insertions(+), 268 deletions(-) create mode 100644 apps/explorer/lib/explorer/chain/ordered_cache.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index d165881076..a5ea36e249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes - [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs index 19099b8db5..54197c5866 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v1/health_controller_test.exs @@ -4,8 +4,8 @@ defmodule BlockScoutWeb.API.V1.HealthControllerTest do alias Explorer.{Chain, PagingOptions} setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) :ok end diff --git a/apps/block_scout_web/test/support/conn_case.ex b/apps/block_scout_web/test/support/conn_case.ex index 3c7aef4e82..4ab8f3bcd9 100644 --- a/apps/block_scout_web/test/support/conn_case.ex +++ b/apps/block_scout_web/test/support/conn_case.ex @@ -40,8 +40,8 @@ defmodule BlockScoutWeb.ConnCase do Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()}) end - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) {:ok, conn: Phoenix.ConnTest.build_conn()} end diff --git a/apps/block_scout_web/test/support/feature_case.ex b/apps/block_scout_web/test/support/feature_case.ex index a9476a7b85..cdacd547bf 100644 --- a/apps/block_scout_web/test/support/feature_case.ex +++ b/apps/block_scout_web/test/support/feature_case.ex @@ -27,8 +27,8 @@ defmodule BlockScoutWeb.FeatureCase do Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()}) end - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) metadata = Phoenix.Ecto.SQL.Sandbox.metadata_for(Explorer.Repo, self()) {:ok, session} = Wallaby.start_session(metadata: metadata) diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex index c1fb19f600..5f945a65ce 100644 --- a/apps/explorer/lib/explorer/application.ex +++ b/apps/explorer/lib/explorer/application.ex @@ -43,11 +43,11 @@ defmodule Explorer.Application do {Admin.Recovery, [[], [name: Admin.Recovery]]}, {TransactionCount, [[], []]}, {BlockCount, []}, - con_cache_child_spec(Blocks.cache_name()), + Blocks, con_cache_child_spec(NetVersion.cache_name()), con_cache_child_spec(MarketHistoryCache.cache_name()), con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)), - con_cache_child_spec(Transactions.cache_name()) + Transactions ] children = base_children ++ configurable_children() diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 424636f005..dd85692de9 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -1258,14 +1258,16 @@ defmodule Explorer.Chain do block_type = Keyword.get(options, :block_type, "Block") if block_type == "Block" && !paging_options.key do - if Blocks.enough_elements?(paging_options.page_size) do - Blocks.blocks(paging_options.page_size) - else - elements = fetch_blocks(block_type, paging_options, necessity_by_association) + case Blocks.take_enough(paging_options.page_size) do + nil -> + elements = fetch_blocks(block_type, paging_options, necessity_by_association) + + Blocks.update(elements) - Blocks.rewrite_cache(elements) + elements - elements + blocks -> + blocks end else fetch_blocks(block_type, paging_options, necessity_by_association) diff --git a/apps/explorer/lib/explorer/chain/cache/blocks.ex b/apps/explorer/lib/explorer/chain/cache/blocks.ex index 76fc2473a6..4a18646d37 100644 --- a/apps/explorer/lib/explorer/chain/cache/blocks.ex +++ b/apps/explorer/lib/explorer/chain/cache/blocks.ex @@ -3,87 +3,19 @@ defmodule Explorer.Chain.Cache.Blocks do Caches the last imported blocks """ - alias Explorer.Repo + alias Explorer.Chain.Block - @block_numbers_key "block_numbers" - @cache_name :blocks - @number_of_elements 60 + use Explorer.Chain.OrderedCache, + name: :blocks, + max_size: 60, + ids_list_key: "block_numbers", + preload: :transactions, + preload: [miner: :names], + preload: :rewards - def update(block) do - numbers = block_numbers() + @type element :: Block.t() - max_number = if numbers == [], do: -1, else: Enum.max(numbers) - min_number = if numbers == [], do: -1, else: Enum.min(numbers) + @type id :: non_neg_integer() - in_range? = block.number > min_number && Enum.all?(numbers, fn number -> number != block.number end) - not_too_far_away? = block.number > max_number - @number_of_elements - 1 - - if (block.number > max_number || Enum.count(numbers) == 1 || in_range?) && not_too_far_away? do - if Enum.count(numbers) >= @number_of_elements do - remove_block(numbers) - put_block(block, List.delete(numbers, Enum.min(numbers))) - else - put_block(block, numbers) - end - end - end - - def rewrite_cache(elements) do - numbers = block_numbers() - - ConCache.delete(@cache_name, @block_numbers_key) - - numbers - |> Enum.each(fn number -> - ConCache.delete(@cache_name, number) - end) - - elements - |> Enum.reduce([], fn element, acc -> - put_block(element, acc) - - [element.number | acc] - end) - end - - def enough_elements?(number) do - ConCache.size(@cache_name) > number - end - - def update_blocks(blocks) do - Enum.each(blocks, fn block -> - update(block) - end) - end - - def blocks(number \\ nil) do - numbers = block_numbers() - - number = if is_nil(number), do: Enum.count(numbers), else: number - - numbers - |> Enum.sort() - |> Enum.reverse() - |> Enum.slice(0, number) - |> Enum.map(fn number -> - ConCache.get(@cache_name, number) - end) - end - - def cache_name, do: @cache_name - - def block_numbers do - ConCache.get(@cache_name, @block_numbers_key) || [] - end - - defp remove_block(numbers) do - min_number = Enum.min(numbers) - ConCache.delete(@cache_name, min_number) - end - - defp put_block(block, numbers) do - block_with_preloads = Repo.preload(block, [:transactions, [miner: :names], :rewards]) - ConCache.put(@cache_name, block.number, block_with_preloads) - ConCache.put(@cache_name, @block_numbers_key, [block.number | numbers]) - end + def element_to_id(%Block{number: number}), do: number end diff --git a/apps/explorer/lib/explorer/chain/cache/transactions.ex b/apps/explorer/lib/explorer/chain/cache/transactions.ex index 54748258cf..7dee7ec87d 100644 --- a/apps/explorer/lib/explorer/chain/cache/transactions.ex +++ b/apps/explorer/lib/explorer/chain/cache/transactions.ex @@ -4,140 +4,25 @@ defmodule Explorer.Chain.Cache.Transactions do """ alias Explorer.Chain.Transaction - alias Explorer.Repo - @transactions_ids_key "transactions_ids" - @cache_name :transactions - @max_size 51 - @preloads [ - :block, - created_contract_address: :names, - from_address: :names, - to_address: :names, - token_transfers: :token, - token_transfers: :from_address, - token_transfers: :to_address - ] - - @spec cache_name :: atom() - def cache_name, do: @cache_name - - @doc """ - Fetches a transaction from its id ({block_number, index}), returns nil if not found - """ - @spec get({non_neg_integer(), non_neg_integer()}) :: Transaction.t() | nil - def get(id), do: ConCache.get(@cache_name, id) - - @doc """ - Return the current number of transactions stored - """ - @spec size :: non_neg_integer() - def size, do: Enum.count(transactions_ids()) - - @doc """ - Checks if there are enough transactions stored - """ - @spec enough?(non_neg_integer()) :: boolean() - def enough?(amount) do - amount <= size() - end - - @doc """ - Checks if the number of transactions stored is already the max allowed - """ - @spec full? :: boolean() - def full? do - @max_size <= size() - end - - @doc "Returns the list ids of the transactions currently stored" - @spec transactions_ids :: [{non_neg_integer(), non_neg_integer()}] - def transactions_ids do - ConCache.get(@cache_name, @transactions_ids_key) || [] - end - - @doc "Returns all the stored transactions" - @spec all :: [Transaction.t()] - def all, do: Enum.map(transactions_ids(), &get(&1)) - - @doc "Returns the `n` most recent transactions stored" - @spec take(integer()) :: [Transaction.t()] - def take(amount) do - transactions_ids() - |> Enum.take(amount) - |> Enum.map(&get(&1)) - end - - @doc """ - Returns the `n` most recent transactions, unless there are not as many stored, - in which case returns `nil` - """ - @spec take_enough(integer()) :: [Transaction.t()] | nil - def take_enough(amount) do - if enough?(amount), do: take(amount) - end - - @doc """ - Adds a transaction (or a list of transactions). - If the cache is already full, the transaction will be only stored if it can take - the place of a less recent one. - NOTE: each transaction is inserted atomically - """ - @spec update([Transaction.t()] | Transaction.t() | nil) :: :ok - def update(transactions) when is_nil(transactions), do: :ok - - def update(transactions) when is_list(transactions) do - Enum.map(transactions, &update(&1)) - end - - def update(transaction) do - ConCache.isolated(@cache_name, @transactions_ids_key, fn -> - transaction_id = {transaction.block_number, transaction.index} - ids = transactions_ids() - - if full?() do - {init, [min]} = Enum.split(ids, -1) - - cond do - transaction_id < min -> - :ok - - transaction_id > min -> - insert_transaction(transaction_id, transaction, init) - ConCache.delete(@cache_name, min) - - transaction_id == min -> - put_transaction(transaction_id, transaction) - end - else - insert_transaction(transaction_id, transaction, ids) - end - end) - end - - defp insert_transaction(transaction_id, transaction, ids) do - put_transaction(transaction_id, transaction) - - ConCache.put(@cache_name, @transactions_ids_key, insert_sorted(transaction_id, ids)) - end - - defp put_transaction(transaction_id, transaction) do - full_transaction = Repo.preload(transaction, @preloads) - - ConCache.put(@cache_name, transaction_id, full_transaction) - end - - defp insert_sorted(id, ids) do - case ids do - [] -> - [id] - - [head | tail] -> - cond do - head > id -> [head | insert_sorted(id, tail)] - head < id -> [id | ids] - head == id -> ids - end - end + use Explorer.Chain.OrderedCache, + name: :transactions, + max_size: 51, + preloads: [ + :block, + created_contract_address: :names, + from_address: :names, + to_address: :names, + token_transfers: :token, + token_transfers: :from_address, + token_transfers: :to_address + ] + + @type element :: Transaction.t() + + @type id :: {non_neg_integer(), non_neg_integer()} + + def element_to_id(%Transaction{block_number: block_number, index: index}) do + {block_number, index} end end diff --git a/apps/explorer/lib/explorer/chain/ordered_cache.ex b/apps/explorer/lib/explorer/chain/ordered_cache.ex new file mode 100644 index 0000000000..2a1c0fc689 --- /dev/null +++ b/apps/explorer/lib/explorer/chain/ordered_cache.ex @@ -0,0 +1,326 @@ +defmodule Explorer.Chain.OrderedCache do + @moduledoc """ + Behaviour for a cache of ordered elements. + + A macro based on `ConCache` is provided as well, at its minimum it can be used as; + ``` + use Explorer.Chain.OrderedCache, name + ``` + where `name is an `t:atom/0` identifying the cache. + + All default values can be modified by overriding their respective function or + by setting an option. For example (showing all of them): + ``` + use Explorer.Chain.OrderedCache, + name: :name, # need to be set + max_size: 51, # defaults to 100 + ids_list_key: :ids_key, # defaults to `name` + preloads: [] # defaults to [] + ``` + Note: `preloads` can also be set singularly with the option `preload`, e.g.: + ``` + use Explorer.Chain.OrderedCache, + name: :cache + preload: :block + preload: :address + preload: [transaction: :hash] + ``` + Additionally all of the options accepted by `ConCache.start_link/1` can be + provided as well. By default only `ttl_check_interval:` is set (to `false`). + + It's also possible, and advised, to override the implementation of the `c:prevails?/2` + and `c:element_to_id/1` callbacks. + For typechecking purposes it's also recommended to override the `t:element/0` + and `t:id/0` type definitions. + """ + + @type element :: struct() + + @type id :: term() + + @doc """ + An atom that identifies this cache + """ + @callback cache_name :: atom() + + @doc """ + The key used to store the (ordered) list of elements. + Because this list is stored in the cache itself, one needs to make sure it is + cannot be equal to any element id. + """ + @callback ids_list_key :: term() + + @doc """ + The size that this cache cannot exceed. + """ + @callback max_size :: non_neg_integer() + + @doc """ + Fields of the stored elements that need to be preloaded. + For entities that are not stored in `Explorer.Repo` this should be empty. + """ + @callback preloads :: [term()] + + @doc """ + The function that orders the elements and decides the ones that are stored. + `prevails?(id_a, id_b)` should return `true` if (in case there is no space for both) + the element with `id_a` should be stored instead of the element with `id_b`, + `false` otherwise. + """ + @callback prevails?(id, id) :: boolean() + + @doc """ + The function that obtains an unique `t:id/0` from an `t:element/0` + """ + @callback element_to_id(element()) :: id() + + @doc "Returns the list ids of the elements currently stored" + @callback ids_list :: [id] + + @doc """ + Fetches a element from its id, returns nil if not found + """ + @callback get(id) :: element | nil + + @doc """ + Return the current number of elements stored + """ + @callback size() :: non_neg_integer() + + @doc """ + Checks if there are enough elements stored + """ + @callback enough?(non_neg_integer()) :: boolean() + + @doc """ + Checks if the number of elements stored is already the max allowed + """ + @callback full? :: boolean() + + @doc "Returns all the stored elements" + @callback all :: [element] + + @doc "Returns the `n` most prevailing elements stored, based on `c:prevails?/2`" + @callback take(integer()) :: [element] + + @doc """ + Returns the `n` most prevailing elements, based on `c:prevails?/2`, unless there + are not as many stored, in which case it returns `nil` + """ + @callback take_enough(integer()) :: [element] | nil + + @doc """ + Adds an element, or a list of elements, to the cache. + When the cache is full, only the most prevailing elements will be stored, based + on `c:prevails?/2`. + NOTE: every update is isolated from another one. + """ + @callback update([element] | element | nil) :: :ok + + defmacro __using__(name) when is_atom(name), do: do_using(name, []) + + defmacro __using__(opts) when is_list(opts) do + # name is necessary + name = Keyword.fetch!(opts, :name) + do_using(name, opts) + end + + # credo:disable-for-next-line /Complexity/ + defp do_using(name, opts) when is_atom(name) and is_list(opts) do + ids_list_key = Keyword.get(opts, :ids_list_key, name) + max_size = Keyword.get(opts, :max_size, 100) + preloads = Keyword.get(opts, :preloads) || Keyword.get_values(opts, :preload) + + concache_params = + opts + |> Keyword.drop([:ids_list_key, :max_size, :preloads, :preload]) + |> Keyword.put_new(:ttl_check_interval, false) + + # credo:disable-for-next-line Credo.Check.Refactor.LongQuoteBlocks + quote do + alias Explorer.Chain.OrderedCache + + @behaviour OrderedCache + + ### Automatically set functions + + @impl OrderedCache + def cache_name, do: unquote(name) + + @impl OrderedCache + def ids_list_key, do: unquote(ids_list_key) + + @impl OrderedCache + def max_size, do: unquote(max_size) + + @impl OrderedCache + def preloads, do: unquote(preloads) + + ### Settable functions + + @impl OrderedCache + def prevails?(id_a, id_b), do: id_a > id_b + + @impl OrderedCache + def element_to_id(element), do: element + + ### Straightforward fetching functions + + @impl OrderedCache + def ids_list, do: ConCache.get(cache_name(), ids_list_key()) || [] + + @impl OrderedCache + def get(id), do: ConCache.get(cache_name(), id) + + @impl OrderedCache + def size, do: ids_list() |> Enum.count() + + @impl OrderedCache + def enough?(amount), do: amount <= size() + + @impl OrderedCache + def full?, do: max_size() <= size() + + @impl OrderedCache + def all, do: Enum.map(ids_list(), &get(&1)) + + @impl OrderedCache + def take(amount) do + ids_list() + |> Enum.take(amount) + |> Enum.map(&get(&1)) + end + + @impl OrderedCache + def take_enough(amount) do + # behaves just like `if enough?(amount), do: take(amount)` but fetching + # the list only once + ids = ids_list() + + if amount <= Enum.count(ids) do + ids + |> Enum.take(amount) + |> Enum.map(&get(&1)) + end + end + + ### Updating function + + @impl OrderedCache + def update(elements) when is_nil(elements), do: :ok + + def update(elements) when is_list(elements) do + ConCache.update(cache_name(), ids_list_key(), fn ids -> + updated_list = + elements + |> Enum.map(&{element_to_id(&1), &1}) + |> Enum.sort(&prevails?(&1, &2)) + |> merge_and_update(ids || [], max_size()) + + {:ok, updated_list} + end) + end + + def update(element), do: update([element]) + + defp merge_and_update(_candidates, existing, 0) do + # if there is no more space in the list remove the remaining existing + # elements and return an empty list + remove(existing) + [] + end + + defp merge_and_update([], existing, size) do + # if there are no more candidates to be inserted keep as many of the + # exsisting elements and remove the rest + {remaining, to_remove} = Enum.split(existing, size) + remove(to_remove) + remaining + end + + defp merge_and_update(candidates, [], size) do + # if there are still candidates and no more existing value insert as many + # candidates as possible and ignore the rest + candidates + |> Enum.take(size) + |> Enum.map(fn {element_id, element} -> + put_element(element_id, element) + element_id + end) + end + + defp merge_and_update(candidates, existing, size) do + [{candidate_id, candidate} | to_check] = candidates + [head | tail] = existing + + cond do + head == candidate_id -> + # if a candidate has the id of and existing element, update its value + put_element(candidate_id, candidate) + [head | merge_and_update(to_check, tail, size - 1)] + + prevails?(head, candidate_id) -> + # keep the prevaling existing value and compare all candidates against the rest + [head | merge_and_update(candidates, tail, size - 1)] + + true -> + # insert new prevailing candidate and compare the remaining ones with the rest + put_element(candidate_id, candidate) + [candidate_id | merge_and_update(to_check, existing, size - 1)] + end + end + + defp remove(key) do + # Always performs async removal so it can wait 1/10 of a second and + # others have the time to get elements that were in the cache's list. + # Different updates cannot interfere with the removed element because + # if this was scheduled for removal it means it is too old, so following + # updates cannot insert it in the future. + Task.start(fn -> + Process.sleep(100) + + if is_list(key) do + Enum.map(key, &ConCache.delete(cache_name(), &1)) + else + ConCache.delete(cache_name(), key) + end + end) + end + + defp put_element(element_id, element) do + full_element = + if Enum.empty?(preloads()) do + element + else + Explorer.Repo.preload(element, preloads()) + end + + # dirty puts are a little faster than puts with locks. + # this is not a problem because this is the only function modifying rows + # and it only gets called inside `update`, which works isolated + ConCache.dirty_put(cache_name(), element_id, full_element) + end + + ### Supervisor's child specification + + @doc """ + The child specification for a Supervisor. Note that all the `params` + provided to this function will override the ones set by using the macro + """ + def child_spec(params) do + params = Keyword.merge(unquote(concache_params), params) + + Supervisor.child_spec({ConCache, params}, id: child_id()) + end + + def child_id, do: {ConCache, cache_name()} + + defoverridable cache_name: 0, + ids_list_key: 0, + max_size: 0, + preloads: 0, + prevails?: 2, + element_to_id: 1 + end + end +end diff --git a/apps/explorer/test/explorer/chain/cache/blocks_test.exs b/apps/explorer/test/explorer/chain/cache/blocks_test.exs index 52ac4eabb4..87f887ae26 100644 --- a/apps/explorer/test/explorer/chain/cache/blocks_test.exs +++ b/apps/explorer/test/explorer/chain/cache/blocks_test.exs @@ -16,7 +16,7 @@ defmodule Explorer.Chain.Cache.BlocksTest do Blocks.update(block) - assert Blocks.blocks() == [block] + assert Blocks.all() == [block] end test "adds a new elements removing the oldest one" do @@ -30,22 +30,16 @@ defmodule Explorer.Chain.Cache.BlocksTest do block.number end) + assert Blocks.size() == 60 + new_block = insert(:block, number: 70) Blocks.update(new_block) new_blocks = blocks |> List.replace_at(0, new_block.number) |> Enum.sort() |> Enum.reverse() - assert Enum.map(Blocks.blocks(), & &1.number) == new_blocks - end - - test "does not add too old blocks" do - block = insert(:block, number: 100_000) |> Repo.preload([:transactions, [miner: :names], :rewards]) - old_block = insert(:block, number: 1_000) + assert Blocks.full?() - Blocks.update(block) - Blocks.update(old_block) - - assert Blocks.blocks() == [block] + assert Enum.map(Blocks.all(), & &1.number) == new_blocks end test "adds missing element" do @@ -55,30 +49,13 @@ defmodule Explorer.Chain.Cache.BlocksTest do Blocks.update(block1) Blocks.update(block2) - assert Enum.count(Blocks.blocks()) == 2 + assert Blocks.size() == 2 block3 = insert(:block, number: 6) Blocks.update(block3) - assert Enum.map(Blocks.blocks(), & &1.number) == [10, 6, 4] - end - end - - describe "rewrite_cache/1" do - test "updates cache" do - block = insert(:block) - - Blocks.update(block) - - block1 = insert(:block) |> Repo.preload([:transactions, [miner: :names], :rewards]) - block2 = insert(:block) |> Repo.preload([:transactions, [miner: :names], :rewards]) - - new_blocks = [block1, block2] - - Blocks.rewrite_cache(new_blocks) - - assert Blocks.blocks() == [block2, block1] + assert Enum.map(Blocks.all(), & &1.number) == [10, 6, 4] end end end diff --git a/apps/explorer/test/explorer/market/market_history_cache_test.exs b/apps/explorer/test/explorer/market/market_history_cache_test.exs index 6dbd15fe7f..1ce5ba16f1 100644 --- a/apps/explorer/test/explorer/market/market_history_cache_test.exs +++ b/apps/explorer/test/explorer/market/market_history_cache_test.exs @@ -9,8 +9,8 @@ defmodule Explorer.Market.MarketHistoryCacheTest do Supervisor.restart_child(Explorer.Supervisor, {ConCache, MarketHistoryCache.cache_name()}) on_exit(fn -> - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) end) :ok diff --git a/apps/explorer/test/explorer/market/market_test.exs b/apps/explorer/test/explorer/market/market_test.exs index 881e1dccc8..44342b3996 100644 --- a/apps/explorer/test/explorer/market/market_test.exs +++ b/apps/explorer/test/explorer/market/market_test.exs @@ -6,12 +6,12 @@ defmodule Explorer.MarketTest do alias Explorer.Repo setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) on_exit(fn -> - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) end) :ok diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex index e159891987..fa87839725 100644 --- a/apps/explorer/test/support/data_case.ex +++ b/apps/explorer/test/support/data_case.ex @@ -40,10 +40,10 @@ defmodule Explorer.DataCase do end Explorer.Chain.Cache.BlockNumber.setup() - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Blocks.cache_name()}) - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, Explorer.Chain.Cache.Transactions.cache_name()}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) :ok end diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index 4155538e76..6a4eb3661b 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -189,7 +189,7 @@ defmodule Indexer.Block.Fetcher do BlockNumber.update(max_block.number) BlockNumber.update(min_block.number) - BlocksCache.update_blocks(blocks) + BlocksCache.update(blocks) end defp update_transactions_cache(transactions) do From c1fb2178f0644b6dde4b38b0ffa209c084d10bae Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 14 Aug 2019 19:00:25 +0300 Subject: [PATCH 182/290] Network icons preload --- CHANGELOG.md | 1 + .../assets/css/_images-preload.scss | 14 +++++++++ apps/block_scout_web/assets/css/app.scss | 1 + .../css/components/_network-selector.scss | 31 +++++++++++++++++++ .../layout/_network_selector_item.html.eex | 2 +- 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 apps/block_scout_web/assets/css/_images-preload.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ea36e249..b3919f00ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload - [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs - [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records diff --git a/apps/block_scout_web/assets/css/_images-preload.scss b/apps/block_scout_web/assets/css/_images-preload.scss new file mode 100644 index 0000000000..ee25dbd966 --- /dev/null +++ b/apps/block_scout_web/assets/css/_images-preload.scss @@ -0,0 +1,14 @@ +body:after { + position:absolute; width:0; height:0; overflow:hidden; z-index:-1; + content: + url(/images/network-selector-icons/callisto-mainnet.png) + url(/images/network-selector-icons/ethereum-classic.png) + url(/images/network-selector-icons/goerli-testnet.png) + url(/images/network-selector-icons/kovan-testnet.png) + url(/images/network-selector-icons/poa-core.png) + url(/images/network-selector-icons/poa-sokol.png) + url(/images/network-selector-icons/rinkeby-testnet.png) + url(/images/network-selector-icons/rsk-mainnet.png) + url(/images/network-selector-icons/ropsten-testnet.png) + url(/images/network-selector-icons/xdai-chain.png) +}; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/app.scss b/apps/block_scout_web/assets/css/app.scss index 4bc13bd0bc..508bb5335b 100644 --- a/apps/block_scout_web/assets/css/app.scss +++ b/apps/block_scout_web/assets/css/app.scss @@ -60,6 +60,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; // Custom SCSS @import "layout"; @import "typography"; +@import "images-preload"; @import "code"; @import "helpers"; @import "elements"; diff --git a/apps/block_scout_web/assets/css/components/_network-selector.scss b/apps/block_scout_web/assets/css/components/_network-selector.scss index e8b5f72e78..65e5437641 100644 --- a/apps/block_scout_web/assets/css/components/_network-selector.scss +++ b/apps/block_scout_web/assets/css/components/_network-selector.scss @@ -243,6 +243,37 @@ $network-selector-item-icon-dimensions: 30px !default; height: $network-selector-item-icon-dimensions; margin: 0 15px 0 0; width: $network-selector-item-icon-dimensions; + + &-callisto-mainnet { + background-image: url(/images/network-selector-icons/callisto-mainnet.png) + } + &-ethereum-classic { + background-image: url(/images/network-selector-icons/ethereum-classic.png) + } + &-goerli-testnet { + background-image: url(/images/network-selector-icons/goerli-testnet.png) + } + &-kovan-testnet { + background-image: url(/images/network-selector-icons/kovan-testnet.png) + } + &-poa-core { + background-image: url(/images/network-selector-icons/poa-core.png) + } + &-poa-sokol { + background-image: url(/images/network-selector-icons/poa-sokol.png) + } + &-rinkeby-testnet { + background-image: url(/images/network-selector-icons/rinkeby-testnet.png) + } + &-rsk-mainnet { + background-image: url(/images/network-selector-icons/rsk-mainnet.png) + } + &-ropsten-testnet { + background-image: url(/images/network-selector-icons/ropsten-testnet.png) + } + &-xdai-chain { + background-image: url(/images/network-selector-icons/xdai-chain.png) + } } .network-selector-item-title { diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_network_selector_item.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_network_selector_item.html.eex index 55ea7a6023..74ab4ed7ba 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_network_selector_item.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_network_selector_item.html.eex @@ -5,7 +5,7 @@ - .png');"> + <%= @title %> From 829a0e35e6a3dfdc450c766afc15fed35ed30a7d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 14 Aug 2019 20:37:18 +0300 Subject: [PATCH 183/290] Ease non-critical css --- CHANGELOG.md | 1 + .../assets/css/non-critical.scss | 2 +- .../theme/_dai_variables-non-critical.scss | 1 + .../theme/_ether1_variables-non-critical.scss | 1 + ...hereum_classic_variables-non-critical.scss | 1 + .../_ethereum_variables-non-critical.scss | 1 + .../theme/_goerli_variables-non-critical.scss | 1 + .../theme/_kovan_variables-non-critical.scss | 1 + .../theme/_lukso_variables-non-critical.scss | 1 + .../_neutral_variables-non-critical.scss | 1 + .../theme/_poa_variables-non-critical.scss | 1 + .../_rinkeby_variables-non-critical.scss | 1 + .../_ropsten_variables-non-critical.scss | 1 + .../theme/_rsk_variables-non-critical.scss | 1 + .../theme/_sokol_variables-non-critical.scss | 1 + .../css/theme/_variables-non-critical.scss | 22 +++++++++++++++++++ 16 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss create mode 100644 apps/block_scout_web/assets/css/theme/_variables-non-critical.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ea36e249..4768fb3932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs - [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records diff --git a/apps/block_scout_web/assets/css/non-critical.scss b/apps/block_scout_web/assets/css/non-critical.scss index 8c1cd18d07..826f349d31 100644 --- a/apps/block_scout_web/assets/css/non-critical.scss +++ b/apps/block_scout_web/assets/css/non-critical.scss @@ -2,7 +2,7 @@ @import "node_modules/bootstrap/scss/functions"; @import "node_modules/bootstrap/scss/mixins"; -@import "theme/variables"; +@import "theme/variables-non-critical"; @import "node_modules/bootstrap/scss/modal"; @import "node_modules/bootstrap/scss/tooltip"; diff --git a/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss new file mode 100644 index 0000000000..69231f5098 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss new file mode 100644 index 0000000000..c7689bfb97 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: #4b021e; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss new file mode 100644 index 0000000000..3d488a6f1e --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss new file mode 100644 index 0000000000..69231f5098 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss new file mode 100644 index 0000000000..6c80828f14 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss new file mode 100644 index 0000000000..db0e486e0c --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss new file mode 100644 index 0000000000..4d0836af14 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss new file mode 100644 index 0000000000..4d0836af14 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss new file mode 100644 index 0000000000..4d0836af14 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss new file mode 100644 index 0000000000..69231f5098 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss new file mode 100644 index 0000000000..69231f5098 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss new file mode 100644 index 0000000000..69231f5098 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss new file mode 100644 index 0000000000..6c80828f14 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss @@ -0,0 +1 @@ +$btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_variables-non-critical.scss new file mode 100644 index 0000000000..232b9cc647 --- /dev/null +++ b/apps/block_scout_web/assets/css/theme/_variables-non-critical.scss @@ -0,0 +1,22 @@ +@import "theme/base_variables"; +@import "neutral_variables-non-critical"; +// @import "dai_variables-non-critical"; +// @import "ethereum_classic_variables-non-critical"; +// @import "ethereum_variables-non-critical"; +// @import "ether1_variables-non-critical"; +// @import "expanse_variables-non-critical"; +// @import "gochain_variables-non-critical"; +// @import "goerli_variables-non-critical"; +// @import "kovan_variables-non-critical"; +// @import "lukso_variables-non-critical"; +// @import "musicoin_variables-non-critical"; +// @import "pirl_variables-non-critical"; +// @import "poa_variables-non-critical"; +// @import "posdao_variables-non-critical"; +// @import "rinkeby_variables-non-critical"; +// @import "ropsten_variables-non-critical"; +// @import "social_variables-non-critical"; +// @import "sokol_variables-non-critical"; +// @import "tobalaba_variables-non-critical"; +// @import "tomochain_variables-non-critical"; +// @import "rsk_variables-non-critical"; \ No newline at end of file From ee5092833460ba85a4a2f66f47feae7bcce8a137 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 15 Aug 2019 11:05:45 +0300 Subject: [PATCH 184/290] limit request body in json rpc error --- .../lib/ethereum_jsonrpc/decode_error.ex | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/decode_error.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/decode_error.ex index 1b77eac048..5b2fea35cc 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/decode_error.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/decode_error.ex @@ -35,11 +35,23 @@ defmodule EthereumJSONRPC.DecodeError do %EthereumJSONRPC.DecodeError{request: request, response: response} end + @request_body_limit 700 + @impl Exception def message(%EthereumJSONRPC.DecodeError{ request: %EthereumJSONRPC.DecodeError.Request{url: request_url, body: request_body}, response: %EthereumJSONRPC.DecodeError.Response{status_code: response_status_code, body: response_body} }) do + request_body_binary = IO.iodata_to_binary(request_body) + + truncated_request_body = + if byte_size(request_body_binary) < @request_body_limit do + request_body_binary + else + <> = request_body_binary + result + end + """ Failed to decode Ethereum JSONRPC response: @@ -47,7 +59,7 @@ defmodule EthereumJSONRPC.DecodeError do url: #{request_url} - body: #{IO.iodata_to_binary(request_body)} + body: #{truncated_request_body} response: From 534a178fc482faa73782f9478d5ac73da2636083 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 15 Aug 2019 11:09:25 +0300 Subject: [PATCH 185/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d165881076..e1c01e48c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error - [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix From 37ec919e51fc010ebaaf329a09fcf6f7ce12bdc9 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 15 Aug 2019 13:35:58 +0300 Subject: [PATCH 186/290] Add json schema to transaction controller tests --- apps/block_scout_web/mix.exs | 3 +- .../api/rpc/transaction_controller_test.exs | 213 +++++++++++++----- mix.lock | 1 + 3 files changed, 162 insertions(+), 55 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 27a1e6aa74..ef75e4b9e4 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -130,7 +130,8 @@ defmodule BlockScoutWeb.Mixfile do {:wallaby, "~> 0.22", only: [:test], runtime: false}, # `:cowboy` `~> 2.0` and Phoenix 1.4 compatibility {:wobserver, "~> 0.2.0", github: "poanetwork/wobserver", branch: "support-https"}, - {:phoenix_form_awesomplete, "~> 0.1.4"} + {:phoenix_form_awesomplete, "~> 0.1.4"}, + {:ex_json_schema, "~> 0.6.1"} ] end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs index 1ac026bc3c..f48d9ecfde 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs @@ -11,10 +11,12 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + schema = resolve_schema() + assert ExJsonSchema.Validator.valid?(schema, response) assert response["message"] =~ "txhash is required" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -29,10 +31,12 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + schema = resolve_schema() + assert ExJsonSchema.Validator.valid?(schema, response) assert response["message"] =~ "Invalid txhash format" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -46,11 +50,19 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "txhash" => "0x40eb908387324f2b575b4879cd9d7188f69c8fc9d87c901b9e2daaea4b442170" } + schema = resolve_schema(%{ + "type" => "object", + "properties" => %{ + "status" => %{"type" => "string"} + } + }) + assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + assert ExJsonSchema.Validator.valid?(schema, response) assert response["result"] == %{"status" => ""} assert response["status"] == "1" assert response["message"] == "OK" @@ -71,9 +83,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == %{"status" => "1"} assert response["status"] == "1" @@ -95,9 +107,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == %{"status" => "0"} assert response["status"] == "1" @@ -114,9 +126,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == %{"status" => ""} assert response["status"] == "1" @@ -132,10 +144,12 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + schema = resolve_schema() + assert ExJsonSchema.Validator.valid?(schema, response) assert response["message"] =~ "txhash is required" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -150,10 +164,12 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + schema = resolve_schema() + assert ExJsonSchema.Validator.valid?(schema, response) assert response["message"] =~ "Invalid txhash format" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -172,11 +188,20 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "errDescription" => "" } + schema = resolve_schema(%{ + "type" => "object", + "properties" => %{ + "isError" => %{"type" => "string"}, + "errDescription" => %{"type" => "string"} + } + }) + assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + assert ExJsonSchema.Validator.valid?(schema, response) assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" @@ -202,9 +227,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == expected_result assert response["status"] == "1" @@ -279,9 +304,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == expected_result assert response["status"] == "1" @@ -303,9 +328,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["result"] == expected_result assert response["status"] == "1" @@ -321,10 +346,12 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + schema = resolve_schema() + assert ExJsonSchema.Validator.valid?(schema, response) assert response["message"] =~ "txhash is required" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -339,9 +366,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["message"] =~ "Invalid txhash format" assert response["status"] == "0" @@ -357,9 +384,9 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do } assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) assert response["message"] =~ "Transaction not found" assert response["status"] == "0" @@ -367,6 +394,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do refute response["result"] end + @tag :wip test "paginates logs", %{conn: conn} do block = insert(:block, hash: "0x30d522bcf2d8e0cabc286e6e40623c475c3bc05d0ec484ea239c103b1ac0ded9", number: 99) @@ -392,11 +420,31 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "txhash" => "#{transaction.hash}" } + schema = resolve_schema(%{ + "type" => "object", + "properties" => %{ + "next_page_params" => %{ + "type" => ["object", "null"], + "properties" => %{ + "action" => %{"type" => "string"}, + "index" => %{"type" => "number"}, + "module" => %{"type" => "string"}, + "txhash" => %{"type" => "string"} + } + }, + "logs" => %{ + "type" => "array", + "items" => %{"type" => "object"} + } + } + }) + assert response1 = - conn - |> get("/api", params1) - |> json_response(200) + conn + |> get("/api", params1) + |> json_response(200) + assert ExJsonSchema.Validator.valid?(schema, response1) assert response1["status"] == "1" assert response1["message"] == "OK" @@ -410,16 +458,18 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do params2 = response1["result"]["next_page_params"] assert response2 = - conn - |> get("/api", params2) - |> json_response(200) + conn + |> get("/api", params2) + |> json_response(200) + assert ExJsonSchema.Validator.valid?(schema, response2) assert response2["status"] == "1" assert response2["message"] == "OK" assert is_nil(response2["result"]["next_page_params"]) assert response1["result"]["logs"] != response2["result"]["logs"] end + @tag :wip test "with a txhash with ok status", %{conn: conn} do block = insert(:block) @@ -468,14 +518,69 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "next_page_params" => nil } + schema = resolve_schema(%{ + "type" => "object", + "properties" => %{ + "hash" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "blockNumber" => %{"type" => "string"}, + "confirmations" => %{"type" => "string"}, + "success" => %{"type" => "boolean"}, + "from" => %{"type" => "string"}, + "to" => %{"type" => "string"}, + "value" => %{"type" => "string"}, + "input" => %{"type" => "string"}, + "gasLimit" => %{"type" => "string"}, + "gasUsed" => %{"type" => "string"}, + "gasPrice" => %{"type" => "string"}, + "logs" => %{ + "type" => "array", + "items" => %{ + "type" => "object", + "properties" => %{ + "address" => %{"type" => "string"}, + "data" => %{"type" => "string"}, + "topics" => %{ + "type" => "array", + "items" => %{"type" => ["string", "null"]} + }, + "index" => %{"type" => "string"} + } + } + }, + "next_page_params" => %{ + "type" => ["object", "null"], + "properties" => %{ + "action" => %{"type" => "string"}, + "index" => %{"type" => "number"}, + "module" => %{"type" => "string"}, + "txhash" => %{"type" => "string"} + } + }, + } + }) + assert response = - conn - |> get("/api", params) - |> json_response(200) + conn + |> get("/api", params) + |> json_response(200) + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" end end + + defp resolve_schema(result \\ %{}) do + %{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"} + } + } + |> put_in(["properties", "result"], result) + |> ExJsonSchema.Schema.resolve() + end end diff --git a/mix.lock b/mix.lock index 92fd054cb6..3ec4a81808 100644 --- a/mix.lock +++ b/mix.lock @@ -43,6 +43,7 @@ "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.6.4", "5b1ac8451f889576bb29dee70412de1170974298727ab944aa4d17e91bdd3472", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.3", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ex_cldr_units": {:hex, :ex_cldr_units, "2.5.1", "0e65067a22a7c5146266c313d6333c2700868c32aa6d536f47c6c0d84aac3ac1", [:mix], [{:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.2", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.6", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "ex_doc": {:hex, :ex_doc, "0.19.2", "6f4081ccd9ed081b6dc0bd5af97a41e87f5554de469e7d76025fba535180565f", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, + "ex_json_schema": {:hex, :ex_json_schema, "0.6.1", "b57c0588385b8262b80f19d33d9b9b71fcd60d247691abf2635b57a03ec0ad44", [:mix], [], "hexpm"}, "ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"}, "ex_rlp": {:hex, :ex_rlp, "0.5.2", "7f4ce7bd55e543c054ce6d49629b01e9833c3462e3d547952be89865f39f2c58", [:mix], [], "hexpm"}, "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm"}, From c9aafb03e88be98892bbccb67c33b055b30845bc Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 15 Aug 2019 15:12:35 +0300 Subject: [PATCH 187/290] correctly parse mathod_id --- apps/explorer/lib/explorer/chain/log.ex | 13 ++++--- .../explorer/test/explorer/chain/log_test.exs | 34 ++++++++++++++++--- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 027f3ce1ed..717044d66b 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -5,7 +5,7 @@ defmodule Explorer.Chain.Log do require Logger - alias ABI.{Event, FunctionSelector, Util} + alias ABI.{Event, FunctionSelector} alias Explorer.Chain.{Address, ContractMethod, Data, Hash, Transaction} alias Explorer.Repo @@ -116,10 +116,10 @@ defmodule Explorer.Chain.Log do end def decode(log, transaction) do - IO.inspect(" case Util.split_method_id(log.first_topic) do") - case Util.split_method_id(log.first_topic) |> IO.inspect do - {:ok, method_id, _rest} -> - find_candidates(method_id, log, transaction) |> IO.inspect + case log.first_topic do + "0x" <> <> -> + find_candidates(method_id, log, transaction) + _ -> {:error, :could_not_decode} end @@ -136,9 +136,8 @@ defmodule Explorer.Chain.Log do candidates = candidates_query |> Repo.all() - |> IO.inspect |> Enum.flat_map(fn contract_method -> - case find_and_decode(contract_method.abi, log, transaction) do + case find_and_decode([contract_method.abi], log, transaction) do {:ok, _, _} = result -> [result] _ -> [] end diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs index d77922b06b..f27cdc4e04 100644 --- a/apps/explorer/test/explorer/chain/log_test.exs +++ b/apps/explorer/test/explorer/chain/log_test.exs @@ -2,7 +2,7 @@ defmodule Explorer.Chain.LogTest do use Explorer.DataCase alias Ecto.Changeset - alias Explorer.Chain.{ContractMethod, Log, SmartContract} + alias Explorer.Chain.{Log, SmartContract} alias Explorer.Repo doctest Log @@ -103,7 +103,9 @@ defmodule Explorer.Chain.LogTest do end test "finds decoding candidates" do - params = params_for(:smart_contract, %{abi: [ + params = + params_for(:smart_contract, %{ + abi: [ %{ "anonymous" => false, "inputs" => [ @@ -114,7 +116,8 @@ defmodule Explorer.Chain.LogTest do "name" => "WantsPets", "type" => "event" } - ]}) + ] + }) # changeset has a callback to insert contract methods %SmartContract{} @@ -131,14 +134,35 @@ defmodule Explorer.Chain.LogTest do log = insert(:log, transaction: transaction, - first_topic: topic1 <> "00", + first_topic: topic1, second_topic: topic2, third_topic: topic3, fourth_topic: nil, data: data ) - assert Log.decode(log, transaction) + assert Log.decode(log, transaction) == + {:error, :contract_not_verified, + [ + {:ok, + %ABI.FunctionSelector{ + function: "WantsPets", + input_names: ["_from_human", "_number", "_belly"], + inputs_indexed: [true, false, true], + method_id: <<235, 155, 60, 76>>, + returns: [], + type: :event, + types: [:string, {:uint, 256}, :bool] + }, + [ + {"_from_human", "string", true, + {:dynamic, + <<56, 228, 122, 123, 113, 157, 206, 99, 102, 42, 234, 244, 52, 64, 50, 111, 85, 27, 138, 126, + 225, 152, 206, 227, 92, 181, 213, 23, 242, 210, 150, 162>>}}, + {"_number", "uint256", false, 0}, + {"_belly", "bool", true, true} + ]} + ]} end end end From dfbdb442b31db4a2aa516a5451402945867171eb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 15 Aug 2019 15:16:26 +0300 Subject: [PATCH 188/290] use method_id in query --- apps/explorer/lib/explorer/chain/log.ex | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 717044d66b..3e996e2d37 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -117,7 +117,9 @@ defmodule Explorer.Chain.Log do def decode(log, transaction) do case log.first_topic do - "0x" <> <> -> + "0x" <> hex_part -> + {number, ""} = Integer.parse(hex_part, 16) + <> = :binary.encode_unsigned(number) find_candidates(method_id, log, transaction) _ -> @@ -125,11 +127,11 @@ defmodule Explorer.Chain.Log do end end - defp find_candidates(_method_id, log, transaction) do + defp find_candidates(method_id, log, transaction) do candidates_query = from( contract_method in ContractMethod, - # where: contract_method.identifier == ^method_id, + where: contract_method.identifier == ^method_id, limit: 3 ) From 80f1b6665d7394e0740eadd52c1108047f5d50b2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 15 Aug 2019 15:58:01 +0300 Subject: [PATCH 189/290] add log decoding candidates to frontend --- .../templates/transaction_log/_logs.html.eex | 56 ++++++++++++++++++- .../views/transaction_log_view.ex | 2 +- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index c63502669b..f55d52b6aa 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -83,7 +83,61 @@ <% end %> -
    +
    + <% {:error, :contract_not_verified, results} when is_list(results) and not results == [] -> %> + <%= for {:ok, method_id, text, mapping} <- results do %> +
    <%= gettext "Decoded" %>
    +
    + + + + + + + + + +
    Method Id0x<%= method_id %>
    Call<%= text %>
    +
    + " class="table thead-light table-bordered"> + + + + + + + + <%= for {name, type, indexed?, value} <- mapping do %> + + + + + + + + <% end %> +
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    + <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> + <% :error -> %> + <%= nil %> + <% copy_text -> %> + + + + + + <% end %> + <%= name %><%= type %><%= indexed? %> + 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    +
    +
    + <% end %> <% _ -> %> <%= nil %> <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex index 50d406433c..16378418fb 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex @@ -5,6 +5,6 @@ defmodule BlockScoutWeb.TransactionLogView do alias Explorer.Chain.Log def decode(log, transaction) do - Log.decode(log, transaction) + Log.decode(log, transaction) |> IO.inspect end end From 6c206b88d8bea41704720e84881c04a9a88ee08d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 15 Aug 2019 16:40:05 +0300 Subject: [PATCH 190/290] Need recompile column in the env vars table --- CHANGELOG.md | 1 + docs/env-variables.md | 98 ++++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f006769dbf..c9614afa96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table - [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix diff --git a/docs/env-variables.md b/docs/env-variables.md index 60c9eee442..a0fae07bc3 100644 --- a/docs/env-variables.md +++ b/docs/env-variables.md @@ -14,52 +14,54 @@ $ export NETWORK=POA ``` -| Variable | Required | Description | Default | Version | -| --- | --- | --- | ---| --- | -| `NETWORK`| :white_check_mark: | Environment variable for the main EVM network such as Ethereum Network or POA Network | POA Network | all | -| `SUBNETWORK` | :white_check_mark: | Environment variable for the subnetwork such as Core or Sokol Network | Sokol Testnet | all | -| `NETWORK_ICON` | :white_check_mark: | Environment variable for the main network icon or testnet icon. Two options are `_test_network_icon.html` and `_network_icon.html` | `_test_network_icon.html` | all | -| `LOGO` | :white_check_mark: | Environment variable for the logo image location. The logo files names for different chains can be found [here](https://github.com/poanetwork/blockscout/tree/master/apps/block_scout_web/assets/static/images) | /images/blockscout_logo.svg | all | -| `ETHEREUM_JSONRPC_VARIANT` | :white_check_mark: | This environment variable is used to tell the application which RPC Client the node is using (i.e. Geth, Parity, or Ganache) | parity | all | -| `ETHEREUM_JSONRPC_HTTP_URL` | :white_check_mark: | The RPC endpoint used to fetch blocks, transactions, receipts, tokens. | localhost:8545 | all | -| `ETHEREUM_JSONRPC_TRACE_URL` | | The RPC endpoint specifically for the Geth/Parity client used by trace_block and trace_replayTransaction. This can be used to designate a tracing node. | localhost:8545 | all | -| `ETHEREUM_JSONRPC_WS_URL` | :white_check_mark: | The WebSockets RPC endpoint used to subscribe to the `newHeads` subscription alerting the indexer to fetch new blocks. | ws://localhost:8546 | all | -| `NETWORK_PATH` | | Used to set a network path other than what is displayed in the root directory. An example would be to add /eth/mainnet/ to the root directory. | (empty) | all | -| `SECRET_KEY_BASE` | :white_check_mark: | Use mix phx.gen.secret to generate a new Secret Key Base string to protect production assets. | (empty) | all | -| `CHECK_ORIGIN` | | Used to check the origin of requests when the origin header is present. It defaults to false. In case of true, it will check against the host value. | false | all | -| `PORT` | :white_check_mark: | Default port the application runs on is 4000 | 4000 | all | -| `COIN` | :white_check_mark: | The coin here is checked via the Coinmarketcap API to obtain USD prices on graphs and other areas of the UI | POA | all | -| `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | -| `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | -| `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | -| `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all | -| `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all | -| `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all | -| `ECTO_USE_SSL` | | Production environment variable to use SSL on Ecto queries. | true | all | -| `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all | -| `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all | +| Variable | Required | Description | Default | Version | Need recompile | +| --- | --- | --- | ---| --- | --- | +| `NETWORK`| :white_check_mark: | Environment variable for the main EVM network such as Ethereum Network or POA Network | POA Network | all | | +| `SUBNETWORK` | :white_check_mark: | Environment variable for the subnetwork such as Core or Sokol Network | Sokol Testnet | all | | +| `NETWORK_ICON` | :white_check_mark: | Environment variable for the main network icon or testnet icon. Two options are `_test_network_icon.html` and `_network_icon.html` | `_test_network_icon.html` | all | | +| `LOGO` | :white_check_mark: | Environment variable for the logo image location. The logo files names for different chains can be found [here](https://github.com/poanetwork/blockscout/tree/master/apps/block_scout_web/assets/static/images) | /images/blockscout_logo.svg | all | | +| `ETHEREUM_JSONRPC_VARIANT` | :white_check_mark: | This environment variable is used to tell the application which RPC Client the node is using (i.e. Geth, Parity, or Ganache) | parity | all | | +| `ETHEREUM_JSONRPC_HTTP_URL` | :white_check_mark: | The RPC endpoint used to fetch blocks, transactions, receipts, tokens. | localhost:8545 | all | | +| `ETHEREUM_JSONRPC_TRACE_URL` | | The RPC endpoint specifically for the Geth/Parity client used by trace_block and trace_replayTransaction. This can be used to designate a tracing node. | localhost:8545 | all | | +| `ETHEREUM_JSONRPC_WS_URL` | :white_check_mark: | The WebSockets RPC endpoint used to subscribe to the `newHeads` subscription alerting the indexer to fetch new blocks. | ws://localhost:8546 | all | | +| `NETWORK_PATH` | | Used to set a network path other than what is displayed in the root directory. An example would be to add /eth/mainnet/ to the root directory. | (empty) | all | | +| `SECRET_KEY_BASE` | :white_check_mark: | Use mix phx.gen.secret to generate a new Secret Key Base string to protect production assets. | (empty) | all | | +| `CHECK_ORIGIN` | | Used to check the origin of requests when the origin header is present. It defaults to false. In case of true, it will check against the host value. | false | all | | +| `PORT` | :white_check_mark: | Default port the application runs on is 4000 | 4000 | all | | +| `COIN` | :white_check_mark: | The coin here is checked via the Coinmarketcap API to obtain USD prices on graphs and other areas of the UI | POA | all | | +| `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | | +| `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | | +| `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | | +| `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all | | +| `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all | | +| `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all | | +| `ECTO_USE_SSL` | | Production environment variable to use SSL on Ecto queries. | true | all | | +| `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all | | +| `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all | | | `SPANDEX_BATCH_SIZE` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | -| `SPANDEX_SYNC_THRESHOLD` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | -| `HEART_BEAT_TIMEOUT` | | Production environment variable to restart the application in the event of a crash. | 30 | all | -| `HEART_COMMAND` | | Production environment variable to restart the application in the event of a crash. | systemctl restart explorer.service | all | -| `BLOCKSCOUT_VERSION` | | Added to the footer to signify the current BlockScout version. | (empty) | v1.3.4+ | -| `RELEASE_LINK` | | The link to Blockscout release notes in the footer. | https: //github.com/poanetwork/
    blockscout/releases/
    tag/${BLOCKSCOUT_VERSION} | v1.3.5+ | -| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | -| `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base | v1.3.4+ | -| `GRAPHIQL _TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) | v1.3.4+ | -| `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 | v1.3.8+ | -| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | v2.0.3+ | -| `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 | v1.3.9+ | -| `ADDRESS_WITH_BALANCES`
    `_UPDATE_INTERVAL`| | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 | v1.3.9+ | -| `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer | (empty) | v1.3.0+ | -| `COINMARKETCAP_PAGES` | | the number of pages on coinmarketcap to list in order to find token's price | 10 | v1.3.10+ | -| `CHAIN_SPEC_PATH` | | Chain specification path (absolute file system path or url) to import block emission reward ranges and genesis account balances from | (empty) | master | -| `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects. | (empty) | v2.0.0+ | -| `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876) | 600 | v2.0.0+ | -| `ALLOWED_EVM_VERSIONS ` | | the comma-separated list of allowed EVM versions for contracts verification. This var was introduced in [#1964](https://github.com/poanetwork/blockscout/pull/1964) | "homestead, tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg" | v2.0.0+ | -| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | v2.0.3+ | -| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | -| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | -| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | v2.0.3+ | -| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | v2.0.3+ | -| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | v2.0.3+ | +| `SPANDEX_SYNC_THRESHOLD` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | | +| `HEART_BEAT_TIMEOUT` | | Production environment variable to restart the application in the event of a crash. | 30 | all | | +| `HEART_COMMAND` | | Production environment variable to restart the application in the event of a crash. | systemctl restart explorer.service | all | | +| `BLOCKSCOUT_VERSION` | | Added to the footer to signify the current BlockScout version. | (empty) | v1.3.4+ | | +| `RELEASE_LINK` | | The link to Blockscout release notes in the footer. | https: //github.com/poanetwork/
    blockscout/releases/
    tag/${BLOCKSCOUT_VERSION} | v1.3.5+ | | +| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | | +| `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base | v1.3.4+ | | +| `GRAPHIQL_TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) | v1.2.0+ | :white_check_mark: | +| `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 | v1.3.8+ | | +| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | v2.0.3+ | | +| `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 | v1.3.9+ | | +| `ADDRESS_WITH_BALANCES`
    `_UPDATE_INTERVAL`| | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 | v1.3.9+ | | +| `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer | (empty) | v1.3.0+ | | +| `COINMARKETCAP_PAGES` | | the number of pages on coinmarketcap to list in order to find token's price | 10 | v1.3.10+ | | +| `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects. | (empty) | v2.0.0+ | | +| `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876) | 600 | v2.0.0+ | | +| `ALLOWED_EVM_VERSIONS ` | | the comma-separated list of allowed EVM versions for contracts verification. This var was introduced in [#1964](https://github.com/poanetwork/blockscout/pull/1964) | "homestead, tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg" | v2.0.0+ | | +| `AVERAGE_BLOCK_CACHE_PERIOD` | | Update of average block cache, in seconds | 30 minutes | v2.0.2+ | +| `MARKET_HISTORY_CACHE_PERIOD` | | Update of market history cache, in seconds | 6 hours | v2.0.2+ | +| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | +| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | +| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | +| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | v2.0.3+ | :white_check_mark: | +| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | +| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | +| `CHAIN_SPEC_PATH` | | Chain specification path (absolute file system path or url) to import block emission reward ranges and genesis account balances from | (empty) | master | | From 0769f2ae3a074fa7b45839f10dbc597b151a74e4 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 15 Aug 2019 17:07:26 +0300 Subject: [PATCH 191/290] Add json schema tests for address controller --- .../api/rpc/address_controller_test.exs | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) 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 b8a3a85845..7e88d4717f 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 @@ -47,6 +47,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = listaccounts_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] == "OK" assert response["status"] == "1" assert response["result"] == [] @@ -63,6 +65,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = listaccounts_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] == "OK" assert response["status"] == "1" @@ -120,6 +124,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = listaccounts_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] == "OK" assert response["status"] == "1" @@ -158,6 +164,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] =~ "'address' is required" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -176,6 +184,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] =~ "Invalid address hash" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -194,6 +204,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["result"] == "0" assert response["status"] == "1" assert response["message"] == "OK" @@ -213,6 +225,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["result"] == "#{address.fetched_coin_balance.value}" assert response["status"] == "1" assert response["message"] == "OK" @@ -245,6 +259,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" @@ -289,6 +305,8 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["message"] =~ "Invalid address hash" assert response["status"] == "0" assert Map.has_key?(response, "result") @@ -315,6 +333,9 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> get("/api", params) |> json_response(200) + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) + assert :ok = ExJsonSchema.Validator.validate(schema, response) assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" @@ -350,6 +371,9 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "with an address that exists and one that doesn't", %{conn: conn} do @@ -375,6 +399,9 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "up to a maximum of 20 addresses in a single request", %{conn: conn} do @@ -399,6 +426,9 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 20 assert response["status"] == "1" assert response["message"] == "OK" + + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "with a single address", %{conn: conn} do @@ -422,6 +452,9 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + + schema = balance_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "supports GET and POST requests", %{conn: conn} do @@ -471,6 +504,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -489,6 +523,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -506,6 +541,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with a valid address", %{conn: conn} do @@ -556,6 +592,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "includes correct confirmations value", %{conn: conn} do @@ -580,12 +617,14 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do expected_confirmations = block_height - transaction.block_number assert %{"result" => [returned_transaction]} = + response = conn |> get("/api", params) |> json_response(200) assert returned_transaction["confirmations"] == "#{expected_confirmations}" assert returned_transaction["hash"] == "#{hash}" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "returns '1' for 'isError' with failed transaction", %{conn: conn} do @@ -605,6 +644,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do } assert %{"result" => [returned_transaction]} = + response = conn |> get("/api", params) |> json_response(200) @@ -612,6 +652,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert returned_transaction["isError"] == "1" assert returned_transaction["txreceipt_status"] == "0" assert returned_transaction["hash"] == "#{hash}" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with address with multiple transactions", %{conn: conn} do @@ -648,6 +689,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "orders transactions by block, in ascending order", %{conn: conn} do @@ -688,6 +730,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert block_numbers_order == Enum.sort(block_numbers_order, &(&1 <= &2)) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "orders transactions by block, in descending order", %{conn: conn} do @@ -728,6 +771,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert block_numbers_order == Enum.sort(block_numbers_order, &(&1 >= &2)) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "ignores invalid sort option, defaults to ascending", %{conn: conn} do @@ -768,6 +812,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert block_numbers_order == Enum.sort(block_numbers_order, &(&1 <= &2)) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with valid pagination params", %{conn: conn} do @@ -821,6 +866,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "ignores pagination params when invalid", %{conn: conn} do @@ -862,6 +908,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 6 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "ignores offset param if offset is less than 1", %{conn: conn} do @@ -889,6 +936,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 6 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "ignores offset param if offset is over 10,000", %{conn: conn} do @@ -916,6 +964,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 6 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with page number with no results", %{conn: conn} do @@ -957,6 +1006,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with startblock and endblock params", %{conn: conn} do @@ -995,6 +1045,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with startblock but without endblock", %{conn: conn} do @@ -1032,6 +1083,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with endblock but without startblock", %{conn: conn} do @@ -1069,6 +1121,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "ignores invalid startblock and endblock", %{conn: conn} do @@ -1097,6 +1150,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 8 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with starttimestamp and endtimestamp params", %{conn: conn} do @@ -1144,6 +1198,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with starttimestamp but without endtimestamp", %{conn: conn} do @@ -1191,6 +1246,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with endtimestamp but without starttimestamp", %{conn: conn} do @@ -1236,6 +1292,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with filterby=to option", %{conn: conn} do @@ -1263,6 +1320,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 1 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "with filterby=from option", %{conn: conn} do @@ -1293,6 +1351,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 2 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) end test "supports GET and POST requests", %{conn: conn} do @@ -1338,6 +1397,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end end @@ -1358,6 +1418,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "with a txhash that doesn't exist", %{conn: conn} do @@ -1375,6 +1436,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No internal transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "response includes all the expected fields", %{conn: conn} do @@ -1427,6 +1489,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "isError is true if internal transaction has an error", %{conn: conn} do @@ -1459,6 +1522,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert found_internal_transaction["isError"] == "1" assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "with transaction with multiple internal transactions", %{conn: conn} do @@ -1486,6 +1550,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(found_internal_transactions) == 3 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end end @@ -1506,6 +1571,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "with a address that doesn't exist", %{conn: conn} do @@ -1523,6 +1589,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No internal transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "response includes all the expected fields", %{conn: conn} do @@ -1575,6 +1642,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "isError is true if internal transaction has an error", %{conn: conn} do @@ -1610,6 +1678,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert found_internal_transaction["isError"] == "1" assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end test "with transaction with multiple internal transactions", %{conn: conn} do @@ -1645,6 +1714,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(found_internal_transactions) == 3 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response) end end @@ -1664,6 +1734,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -1682,6 +1753,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -1699,6 +1771,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No token transfers found" + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "has correct value for ERC-721", %{conn: conn} do @@ -1734,6 +1807,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert result["value"] == to_string(token_transfer.token_id) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "returns all the required fields", %{conn: conn} do @@ -1785,6 +1859,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "with an invalid contract address", %{conn: conn} do @@ -1804,6 +1879,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end test "filters results by contract address", %{conn: conn} do @@ -1837,6 +1913,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert result["contractAddress"] == to_string(contract_address.hash) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokentx_schema(), response) end end @@ -1856,6 +1933,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with contractaddress but without address", %{conn: conn} do @@ -1874,6 +1952,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with address but without contractaddress", %{conn: conn} do @@ -1892,6 +1971,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with an invalid contractaddress hash", %{conn: conn} do @@ -1911,6 +1991,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -1930,6 +2011,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with a contractaddress and address that doesn't exist", %{conn: conn} do @@ -1948,6 +2030,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == "0" assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with contractaddress and address without row in token_balances table", %{conn: conn} do @@ -1969,6 +2052,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == "0" assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end test "with contractaddress and address with existing balance in token_balances table", %{conn: conn} do @@ -1989,6 +2073,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == to_string(token_balance.value) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokenbalance_schema(), response) end end @@ -2008,6 +2093,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -2026,6 +2112,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -2043,6 +2130,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No tokens found" + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end test "with an address without row in token_balances table", %{conn: conn} do @@ -2062,6 +2150,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No tokens found" + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end test "with address with existing balance in token_balances table", %{conn: conn} do @@ -2092,6 +2181,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end test "with address with multiple tokens", %{conn: conn} do @@ -2115,6 +2205,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert length(response["result"]) == 2 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokenlist_schema(), response) end end @@ -2134,6 +2225,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -2152,6 +2244,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -2169,6 +2262,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No blocks found" + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end test "returns all the required fields", %{conn: conn} do @@ -2208,6 +2302,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end test "with a block with one transaction", %{conn: conn} do @@ -2247,6 +2342,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end test "with pagination options", %{conn: conn} do @@ -2297,6 +2393,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(block_schema(), response) end end @@ -2439,4 +2536,162 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do assert result == {:required_params, {:ok, params}} end end + + defp listaccounts_schema do + resolve_schema(%{ + "type" => "array", + "items" => %{ + "type" => "object", + "properties" => %{ + "address" => %{"type" => "string"}, + "balance" => %{"type" => "string"}, + "stale" => %{"type" => "boolean"} + } + } + }) + end + + defp balance_schema do + resolve_schema(%{ + "type" => ["string", "null", "array"], + "items" => %{ + "type" => "object", + "properties" => %{ + "account" => %{"type" => "string"}, + "balance" => %{"type" => "string"}, + "stale" => %{"type" => "boolean"} + } + } + }) + end + + defp txlist_schema do + resolve_schema(%{ + "type" => ["null", "array"], + "items" => %{ + "type" => "object", + "properties" => %{ + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "hash" => %{"type" => "string"}, + "nonce" => %{"type" => "string"}, + "blockHash" => %{"type" => "string"}, + "transactionIndex" => %{"type" => "string"}, + "from" => %{"type" => "string"}, + "to" => %{"type" => "string"}, + "value" => %{"type" => "string"}, + "gas" => %{"type" => "string"}, + "gasPrice" => %{"type" => "string"}, + "isError" => %{"type" => "string"}, + "txreceipt_status" => %{"type" => "string"}, + "input" => %{"type" => "string"}, + "contractAddress" => %{"type" => "string"}, + "cumulativeGasUsed" => %{"type" => "string"}, + "gasUsed" => %{"type" => "string"}, + "confirmations" => %{"type" => "string"} + } + } + }) + end + + defp txlistinternal_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "from" => %{"type" => "string"}, + "to" => %{"type" => "string"}, + "value" => %{"type" => "string"}, + "contractAddress" => %{"type" => "string"}, + "transactionHash" => %{"type" => "string"}, + "index" => %{"type" => "string"}, + "input" => %{"type" => "string"}, + "type" => %{"type" => "string"}, + "gas" => %{"type" => "string"}, + "gasUsed" => %{"type" => "string"}, + "isError" => %{"type" => "string"}, + "errCode" => %{"type" => "string"} + } + } + }) + end + + defp tokentx_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "hash" => %{"type" => "string"}, + "nonce" => %{"type" => "string"}, + "blockHash" => %{"type" => "string"}, + "from" => %{"type" => "string"}, + "contractAddress" => %{"type" => "string"}, + "to" => %{"type" => "string"}, + "logIndex" => %{"type" => "string"}, + "value" => %{"type" => "string"}, + "tokenName" => %{"type" => "string"}, + "tokenSymbol" => %{"type" => "string"}, + "tokenDecimal" => %{"type" => "string"}, + "transactionIndex" => %{"type" => "string"}, + "gas" => %{"type" => "string"}, + "gasPrice" => %{"type" => "string"}, + "gasUsed" => %{"type" => "string"}, + "cumulativeGasUsed" => %{"type" => "string"}, + "input" => %{"type" => "string"}, + "confirmations" => %{"type" => "string"} + } + } + }) + end + + defp tokenbalance_schema, do: resolve_schema(%{"type" => ["string", "null"]}) + + defp tokenlist_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "balance" => %{"type" => "string"}, + "contractAddress" => %{"type" => "string"}, + "name" => %{"type" => "string"}, + "decimals" => %{"type" => "string"}, + "symbol" => %{"type" => "string"}, + "type" => %{"type" => "string"} + } + } + }) + end + + defp block_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "blockReward" => %{"type" => "string"} + } + } + }) + end + + defp resolve_schema(result \\ %{}) do + %{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"} + } + } + |> put_in(["properties", "result"], result) + |> ExJsonSchema.Schema.resolve() + end end From 7c036ccf4f822ad3ac236527e34f7a6b9e6cc221 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 16 Aug 2019 10:43:48 +0300 Subject: [PATCH 192/290] fix gettext and credo --- .../lib/block_scout_web/views/transaction_log_view.ex | 2 +- apps/block_scout_web/priv/gettext/default.pot | 11 +++++++++-- .../priv/gettext/en/LC_MESSAGES/default.po | 11 +++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex index 16378418fb..0cca6151f1 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex @@ -5,6 +5,6 @@ defmodule BlockScoutWeb.TransactionLogView do alias Explorer.Chain.Log def decode(log, transaction) do - Log.decode(log, transaction) |> IO.inspect + Log.decode(log, transaction) |> IO.inspect() end end diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 886a88e4c0..93e2111b51 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -563,6 +563,7 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 msgid "Name" msgstr "" @@ -1134,6 +1135,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:16 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:28 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:36 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:89 msgid "Decoded" msgstr "" @@ -1780,6 +1782,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 msgid "Copy Value" msgstr "" @@ -1793,7 +1796,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:175 msgid "Data" msgstr "" @@ -1806,12 +1810,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:54 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 msgid "Indexed?" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:49 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:102 msgid "Log Data" msgstr "" @@ -1824,7 +1830,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:145 msgid "Topics" msgstr "" @@ -1832,5 +1838,6 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 msgid "Type" 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 8fd1e1ff2e..4ea99bcf8d 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 @@ -563,6 +563,7 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 msgid "Name" msgstr "" @@ -1134,6 +1135,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:16 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:28 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:36 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:89 msgid "Decoded" msgstr "" @@ -1781,6 +1783,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 msgid "Copy Value" msgstr "" @@ -1794,7 +1797,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:175 msgid "Data" msgstr "" @@ -1807,12 +1811,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:54 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 msgid "Indexed?" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:49 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:102 msgid "Log Data" msgstr "" @@ -1825,7 +1831,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:145 msgid "Topics" msgstr "" @@ -1833,5 +1839,6 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 msgid "Type" msgstr "" From 23835d7dae2a3ff7cff31ea5343fae731a3debaf Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 16 Aug 2019 11:23:02 +0300 Subject: [PATCH 193/290] fix transaction logs view --- .../templates/transaction_log/_logs.html.eex | 18 ++++++- .../views/transaction_log_view.ex | 2 +- apps/block_scout_web/priv/gettext/default.pot | 49 ++++++++++--------- .../priv/gettext/en/LC_MESSAGES/default.po | 49 ++++++++++--------- apps/explorer/lib/explorer/chain/log.ex | 10 +++- 5 files changed, 78 insertions(+), 50 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index f55d52b6aa..b0afe771c1 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -1,4 +1,20 @@
    + <% decoded_result = decode(@log, @transaction) %> + <%= case decoded_result do %> + <%= {:error, :contract_not_verified, _cadidates} -> %> +
    + <%= gettext "To see accurate decoded input data, the contract must be verified." %> + <%= case @transaction do %> + <% %{to_address: %{hash: hash}} -> %> + <%= gettext "Verify the contract " %><%= gettext "here" %> + <% _ -> %> + <%= nil %> + <% end %> +
    + <% _ -> %> + <%= nil %> + <% end %> +
    <%= gettext "Address" %>
    @@ -84,7 +100,7 @@ <% end %>
    - <% {:error, :contract_not_verified, results} when is_list(results) and not results == [] -> %> + <% {:error, :contract_not_verified, results} -> %> <%= for {:ok, method_id, text, mapping} <- results do %>
    <%= gettext "Decoded" %>
    diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex index 0cca6151f1..50d406433c 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex @@ -5,6 +5,6 @@ defmodule BlockScoutWeb.TransactionLogView do alias Explorer.Chain.Log def decode(log, transaction) do - Log.decode(log, transaction) |> IO.inspect() + Log.decode(log, transaction) end end diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 93e2111b51..d9998f00fe 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -98,7 +98,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:16 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:3 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:19 #: lib/block_scout_web/views/address_view.ex:99 msgid "Address" msgstr "" @@ -562,8 +562,8 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:68 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 msgid "Name" msgstr "" @@ -1132,10 +1132,10 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:16 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:28 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:16 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:28 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:36 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:89 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:44 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 msgid "Decoded" msgstr "" @@ -1146,7 +1146,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:19 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 msgid "To see decoded input data, the contract must be verified." msgstr "" @@ -1159,14 +1159,16 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:22 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "Verify the contract " msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:22 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "here" msgstr "" @@ -1321,6 +1323,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." msgstr "" @@ -1781,8 +1784,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:81 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:134 msgid "Copy Value" msgstr "" @@ -1795,29 +1798,29 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:175 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:124 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:191 msgid "Data" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:31 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:47 msgid "Failed to decode log data." msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:54 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:70 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:123 msgid "Indexed?" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:49 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:102 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 msgid "Log Data" msgstr "" @@ -1830,14 +1833,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:145 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:161 msgid "Topics" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 msgid "Type" 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 4ea99bcf8d..585b389bc0 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 @@ -98,7 +98,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:16 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:3 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:19 #: lib/block_scout_web/views/address_view.ex:99 msgid "Address" msgstr "" @@ -562,8 +562,8 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:68 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 msgid "Name" msgstr "" @@ -1132,10 +1132,10 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:16 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:28 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:16 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:28 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:36 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:89 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:44 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 msgid "Decoded" msgstr "" @@ -1146,7 +1146,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:19 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 msgid "To see decoded input data, the contract must be verified." msgstr "" @@ -1159,14 +1159,16 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:22 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "Verify the contract " msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:22 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "here" msgstr "" @@ -1322,6 +1324,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." msgstr "" @@ -1782,8 +1785,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:81 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:134 msgid "Copy Value" msgstr "" @@ -1796,29 +1799,29 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:175 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:124 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:191 msgid "Data" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:31 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:47 msgid "Failed to decode log data." msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:54 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:70 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:123 msgid "Indexed?" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:49 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:102 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 msgid "Log Data" msgstr "" @@ -1831,14 +1834,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:145 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:161 msgid "Topics" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 msgid "Type" msgstr "" diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 3e996e2d37..f84c59c38d 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -140,8 +140,14 @@ defmodule Explorer.Chain.Log do |> Repo.all() |> Enum.flat_map(fn contract_method -> case find_and_decode([contract_method.abi], log, transaction) do - {:ok, _, _} = result -> [result] - _ -> [] + {:ok, selector, mapping} -> + identifier = Base.encode16(selector.method_id, case: :lower) + text = function_call(selector.function, mapping) + + [{:ok, identifier, text, mapping}] + + _ -> + [] end end) From 0937312366730be86a2950ec14627e1cd78e643e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 16 Aug 2019 11:38:37 +0300 Subject: [PATCH 194/290] add decoding candidates to address logs --- .../templates/address_logs/_logs.html.eex | 85 ++++++++++++++++--- .../templates/transaction_log/_logs.html.eex | 14 +-- apps/block_scout_web/priv/gettext/default.pot | 80 +++++++++-------- .../priv/gettext/en/LC_MESSAGES/default.po | 80 +++++++++-------- 4 files changed, 150 insertions(+), 109 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index e49adf8801..cf19ea6420 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -1,5 +1,20 @@
    ">
    + <% decoded_result = decode(@log, @log.transaction) %> + <%= case decoded_result do %> + <%= {:error, :contract_not_verified, _cadidates} -> %> +
    + <%= gettext "To see accurate decoded input data, the contract must be verified." %> + <%= case @transaction do %> + <% %{to_address: %{hash: hash}} -> %> + <%= gettext "Verify the contract " %><%= gettext "here" %> + <% _ -> %> + <%= nil %> + <% end %> +
    + <% _ -> %> + <%= nil %> + <% end %>
    <%= gettext "Transaction" %>

    @@ -11,19 +26,7 @@ ) %>

    - <%= case decode(@log, @log.transaction) do %> - <% {:error, :contract_not_verified} -> %> -
    <%= gettext "Decoded" %>
    -
    -
    - <%= gettext "To see decoded input data, the contract must be verified." %> - <%= case @log.transaction do %> - <% %{to_address: %{hash: hash}} -> %> - <%= gettext "Verify the contract " %><%= gettext "here" %> - <% _ -> %> - <%= nil %> - <% end %> -
    + <%= case decoded_result do %> <% {:error, :could_not_decode} -> %>
    <%= gettext "Decoded" %>
    @@ -81,7 +84,61 @@ <% end %> -
    +
    + <% {:error, :contract_not_verified, results} -> %> + <%= for {:ok, method_id, text, mapping} <- results do %> +
    <%= gettext "Decoded" %>
    +
    + + + + + + + + + +
    Method Id0x<%= method_id %>
    Call<%= text %>
    +
    + " class="table thead-light table-bordered"> + + + + + + + + <%= for {name, type, indexed?, value} <- mapping do %> + + + + + + + + <% end %> +
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    + <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> + <% :error -> %> + <%= nil %> + <% copy_text -> %> + + + + + + <% end %> + <%= name %><%= type %><%= indexed? %> + 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    +
    +
    + <% end %> <% _ -> %> <%= nil %> <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index b0afe771c1..a0922454a9 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -27,19 +27,7 @@ ) %>
    - <%= case decode(@log, @transaction) do %> - <% {:error, :contract_not_verified} -> %> -
    <%= gettext "Decoded" %>
    -
    -
    - <%= gettext "To see decoded input data, the contract must be verified." %> - <%= case @transaction do %> - <% %{to_address: %{hash: hash}} -> %> - <%= gettext "Verify the contract " %><%= gettext "here" %> - <% _ -> %> - <%= nil %> - <% end %> -
    + <%= case decoded_result do %> <% {:error, :could_not_decode} -> %>
    <%= gettext "Decoded" %>
    diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index d9998f00fe..520dc1d1ed 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -558,12 +558,13 @@ msgid "Must be set to:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:106 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:68 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 msgid "Name" msgstr "" @@ -852,7 +853,7 @@ msgid "Total transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:3 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:18 #: lib/block_scout_web/views/transaction_view.ex:262 msgid "Transaction" msgstr "" @@ -1129,13 +1130,12 @@ msgid "Static Call" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:16 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:28 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:37 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:44 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:93 msgid "Decoded" msgstr "" @@ -1144,12 +1144,6 @@ msgstr "" msgid "Method Id" msgstr "" -#, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 -msgid "To see decoded input data, the contract must be verified." -msgstr "" - #, elixir-format #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:2 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:16 @@ -1157,18 +1151,16 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "Verify the contract " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "here" msgstr "" @@ -1322,6 +1314,7 @@ msgid "To have guaranteed accuracy, use the link above to verify the contract's msgstr "" #, elixir-format +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:7 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." @@ -1782,10 +1775,11 @@ msgid "Constructor Arguments" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:81 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:134 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 msgid "Copy Value" msgstr "" @@ -1795,32 +1789,35 @@ msgid "Create2" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:56 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:124 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:191 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:59 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:112 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:179 msgid "Data" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:47 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 msgid "Failed to decode log data." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:70 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:123 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:111 msgid "Indexed?" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 msgid "Log Data" msgstr "" @@ -1832,15 +1829,16 @@ msgid "Reward" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:161 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:149 msgid "Topics" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 msgid "Type" 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 585b389bc0..1626e8b6a7 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 @@ -558,12 +558,13 @@ msgid "Must be set to:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:106 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:68 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:121 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 msgid "Name" msgstr "" @@ -852,7 +853,7 @@ msgid "Total transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:3 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:18 #: lib/block_scout_web/views/transaction_view.ex:262 msgid "Transaction" msgstr "" @@ -1129,13 +1130,12 @@ msgid "Static Call" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:16 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:28 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:37 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:44 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:105 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:93 msgid "Decoded" msgstr "" @@ -1144,12 +1144,6 @@ msgstr "" msgid "Method Id" msgstr "" -#, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 -msgid "To see decoded input data, the contract must be verified." -msgstr "" - #, elixir-format #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:2 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:16 @@ -1157,18 +1151,16 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "Verify the contract " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:22 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:38 msgid "here" msgstr "" @@ -1323,6 +1315,7 @@ msgid "To have guaranteed accuracy, use the link above to verify the contract's msgstr "" #, elixir-format +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:7 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." @@ -1783,10 +1776,11 @@ msgid "Constructor Arguments" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:63 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:81 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:134 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 msgid "Copy Value" msgstr "" @@ -1796,32 +1790,35 @@ msgid "Create2" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:118 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:56 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:124 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:191 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:59 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:112 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:179 msgid "Data" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:47 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:34 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:35 msgid "Failed to decode log data." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:70 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:123 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:111 msgid "Indexed?" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:47 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:65 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:118 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 msgid "Log Data" msgstr "" @@ -1833,15 +1830,16 @@ msgid "Reward" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:88 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:161 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:149 msgid "Topics" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:51 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 msgid "Type" msgstr "" From 1aa9c39305862ce58a5c5da7112094fe0705b6fb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 16 Aug 2019 11:48:05 +0300 Subject: [PATCH 195/290] fix tests --- apps/explorer/test/explorer/chain/log_test.exs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs index f27cdc4e04..e4ce0695bc 100644 --- a/apps/explorer/test/explorer/chain/log_test.exs +++ b/apps/explorer/test/explorer/chain/log_test.exs @@ -48,7 +48,7 @@ defmodule Explorer.Chain.LogTest do log = insert(:log, transaction: transaction) - assert Log.decode(log, transaction) == {:error, :contract_not_verified} + assert Log.decode(log, transaction) == {:error, :could_not_decode} end test "that a contract call transaction that has a verified contract returns the decoded input data" do @@ -144,16 +144,7 @@ defmodule Explorer.Chain.LogTest do assert Log.decode(log, transaction) == {:error, :contract_not_verified, [ - {:ok, - %ABI.FunctionSelector{ - function: "WantsPets", - input_names: ["_from_human", "_number", "_belly"], - inputs_indexed: [true, false, true], - method_id: <<235, 155, 60, 76>>, - returns: [], - type: :event, - types: [:string, {:uint, 256}, :bool] - }, + {:ok, "eb9b3c4c", "WantsPets(string indexed _from_human, uint256 _number, bool indexed _belly)", [ {"_from_human", "string", true, {:dynamic, From 5c333fa6549cf6a4e946ea9985e86dc90d02fb0d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 16 Aug 2019 11:48:57 +0300 Subject: [PATCH 196/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f006769dbf..9e256eb6f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2555](https://github.com/poanetwork/blockscout/pull/2555) - find and show decoding candidates for logs - [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method - [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation From d36ecd667dd562ebb866704ffcadca5d32c600a2 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Sat, 17 Aug 2019 09:43:57 +0300 Subject: [PATCH 197/290] hotfix: missing vars for non-critical styles --- .../assets/css/theme/_dai_variables-non-critical.scss | 1 + .../css/theme/_ethereum_classic_variables-non-critical.scss | 1 + .../assets/css/theme/_ethereum_variables-non-critical.scss | 1 + .../assets/css/theme/_goerli_variables-non-critical.scss | 1 + .../assets/css/theme/_kovan_variables-non-critical.scss | 1 + .../assets/css/theme/_lukso_variables-non-critical.scss | 1 + .../assets/css/theme/_neutral_variables-non-critical.scss | 1 + .../assets/css/theme/_poa_variables-non-critical.scss | 1 + .../assets/css/theme/_rinkeby_variables-non-critical.scss | 1 + .../assets/css/theme/_ropsten_variables-non-critical.scss | 1 + .../assets/css/theme/_rsk_variables-non-critical.scss | 1 + .../assets/css/theme/_sokol_variables-non-critical.scss | 1 + 12 files changed, 12 insertions(+) diff --git a/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss index 69231f5098..aae48f978a 100644 --- a/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss @@ -1 +1,2 @@ +$secondary: #15bba6; $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss index 3d488a6f1e..91c691af40 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss @@ -1 +1,2 @@ +$tertiary: #5959d8; $btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss index 69231f5098..d8f0d6ecd0 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss @@ -1 +1,2 @@ +$secondary: #49a2ee; $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss index 6c80828f14..59fe6f3977 100644 --- a/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss @@ -1 +1,2 @@ +$sub-accent-color: #a46f30; $btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss index db0e486e0c..c96d76af00 100644 --- a/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss @@ -1 +1,2 @@ +$tertiary: #1f857f; $btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss index 4d0836af14..40182f2a26 100644 --- a/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss @@ -1 +1,2 @@ +$primary: #1d3154; $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss index 4d0836af14..b05591c10e 100644 --- a/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss @@ -1 +1,2 @@ +$primary: #5c34a2; $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss index 4d0836af14..b05591c10e 100644 --- a/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss @@ -1 +1,2 @@ +$primary: #5c34a2; $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss index 69231f5098..e2644143ea 100644 --- a/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss @@ -1 +1,2 @@ +$secondary: #38a9f5; $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss index 69231f5098..e2644143ea 100644 --- a/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss @@ -1 +1,2 @@ +$secondary: #38a9f5; $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss index 69231f5098..24c90dc7fa 100644 --- a/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss @@ -1 +1,2 @@ +$secondary: #27ac8d; $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss index 6c80828f14..7e8ad54355 100644 --- a/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss @@ -1 +1,2 @@ +$sub-accent-color: #1c9f90; $btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file From e707c2ae8f5cd535f2ef15fcc72194ea1d3380be Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Sat, 17 Aug 2019 11:11:44 +0300 Subject: [PATCH 198/290] Hotfix all general variables for non-critical css --- .../assets/css/theme/_dai_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_ether1_variables-non-critical.scss | 6 ++++++ .../css/theme/_ethereum_classic_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_ethereum_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_goerli_variables-non-critical.scss | 6 ++++++ .../assets/css/theme/_kovan_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_lukso_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_neutral_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_poa_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_rinkeby_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_ropsten_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_rsk_variables-non-critical.scss | 5 +++++ .../assets/css/theme/_sokol_variables-non-critical.scss | 6 ++++++ 13 files changed, 68 insertions(+) diff --git a/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss index aae48f978a..d9f670f980 100644 --- a/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #17314f; $secondary: #15bba6; +$tertiary: #93d7ff; +$additional-font: #fff; + $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss index c7689bfb97..f7bf90f4fd 100644 --- a/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss @@ -1 +1,7 @@ +// general +$primary: #840032; +$secondary: #343434; +$tertiary: #7f7f7f; +$additional-font: #ff95db; + $btn-line-color: #4b021e; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss index 91c691af40..bc716596bf 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #1c1c3d; +$secondary: #4ad7a7; $tertiary: #5959d8; +$additional-font: #bdbdff; + $btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss index d8f0d6ecd0..160c0cb684 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #153550; $secondary: #49a2ee; +$tertiary: #4ad7a7; +$additional-font: #89cae6; + $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss index 59fe6f3977..70cfaddd73 100644 --- a/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss @@ -1,2 +1,8 @@ +// general +$primary: #2b2b2b; +$secondary: #eac247; +$tertiary: #929292; +$additional-font: #ffffff; $sub-accent-color: #a46f30; + $btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss index c96d76af00..ab4568e14f 100644 --- a/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #101f25; +$secondary: #35e3d8; $tertiary: #1f857f; +$additional-font: #99fff9; + $btn-line-color: $tertiary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss index 40182f2a26..8a8d7e5eaf 100644 --- a/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general $primary: #1d3154; +$secondary: #fdcec4; +$tertiary: #a96c55; +$additional-font: #a1ded1; + $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss index b05591c10e..3d85713af9 100644 --- a/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general $primary: #5c34a2; +$secondary: #87e1a9; +$tertiary: #bf9cff; +$additional-font: #fff; + $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss index b05591c10e..3d85713af9 100644 --- a/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general $primary: #5c34a2; +$secondary: #87e1a9; +$tertiary: #bf9cff; +$additional-font: #fff; + $btn-line-color: $primary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss index e2644143ea..823da9f2d6 100644 --- a/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #153550; $secondary: #38a9f5; +$tertiary: #76f1ff; +$additional-font: #89cae6; + $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss index e2644143ea..823da9f2d6 100644 --- a/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #153550; $secondary: #38a9f5; +$tertiary: #76f1ff; +$additional-font: #89cae6; + $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss index 24c90dc7fa..c874423aa6 100644 --- a/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss @@ -1,2 +1,7 @@ +// general +$primary: #101f25; $secondary: #27ac8d; +$tertiary: #e39a54; +$additional-font: #a1ded1; + $btn-line-color: $secondary; // button border and font color && hover bg color \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss index 7e8ad54355..64fd3c9f9c 100644 --- a/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss +++ b/apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss @@ -1,2 +1,8 @@ +// general +$primary: #093731; +$secondary: #40bfb2; +$tertiary: #25c9ff; +$additional-font: #93e8dd; $sub-accent-color: #1c9f90; + $btn-line-color: $sub-accent-color; // button border and font color && hover bg color \ No newline at end of file From 0df066bb3215340d6d345d6597de7b759ddd5ec3 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Sat, 17 Aug 2019 11:42:58 +0300 Subject: [PATCH 199/290] Hotfix: ethereum-mainnet network icon preload --- apps/block_scout_web/assets/css/_images-preload.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/block_scout_web/assets/css/_images-preload.scss b/apps/block_scout_web/assets/css/_images-preload.scss index ee25dbd966..8356a8f90e 100644 --- a/apps/block_scout_web/assets/css/_images-preload.scss +++ b/apps/block_scout_web/assets/css/_images-preload.scss @@ -2,6 +2,7 @@ body:after { position:absolute; width:0; height:0; overflow:hidden; z-index:-1; content: url(/images/network-selector-icons/callisto-mainnet.png) + url(/images/network-selector-icons/ethereum-mainnet.png) url(/images/network-selector-icons/ethereum-classic.png) url(/images/network-selector-icons/goerli-testnet.png) url(/images/network-selector-icons/kovan-testnet.png) From 0879b060ffe820060449037f5dffe95d83a9a10d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Sat, 17 Aug 2019 12:04:23 +0300 Subject: [PATCH 200/290] hotfix: missing ethereum-mainnet.png for networks selector --- .../assets/css/components/_network-selector.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/block_scout_web/assets/css/components/_network-selector.scss b/apps/block_scout_web/assets/css/components/_network-selector.scss index 65e5437641..7f2a4c020d 100644 --- a/apps/block_scout_web/assets/css/components/_network-selector.scss +++ b/apps/block_scout_web/assets/css/components/_network-selector.scss @@ -247,6 +247,9 @@ $network-selector-item-icon-dimensions: 30px !default; &-callisto-mainnet { background-image: url(/images/network-selector-icons/callisto-mainnet.png) } + &-ethereum-mainnet { + background-image: url(/images/network-selector-icons/ethereum-mainnet.png) + } &-ethereum-classic { background-image: url(/images/network-selector-icons/ethereum-classic.png) } From 6c7bf6b75897ab7812341156fe283ae29d8a4ec3 Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 11:00:44 +0300 Subject: [PATCH 201/290] Add json schema tests to block controller --- .../api/rpc/block_controller_test.exs | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs index bda89fe49a..50ab2f18f3 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs @@ -14,6 +14,8 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + schema = resolve_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "with an invalid block number", %{conn: conn} do @@ -26,6 +28,8 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + schema = resolve_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "with a block that doesn't exist", %{conn: conn} do @@ -38,6 +42,8 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + schema = resolve_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end test "with a valid block", %{conn: conn} do @@ -71,6 +77,29 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + schema = resolve_schema() + assert :ok = ExJsonSchema.Validator.validate(schema, response) end end + + defp resolve_schema() do + ExJsonSchema.Schema.resolve(%{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"}, + "result" => %{ + "type" => ["object", "null"], + "properties" => %{ + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "number"}, + "blockMiner" => %{"type" => "string"}, + "blockReward" => %{"type" => "string"}, + "uncles" => %{"type" => "null"}, + "uncleInclusionReward" => %{"type" => "null"} + } + } + } + }) + end end From 7c0faaee7fb0edb96bc0e29dcc9b17fcbb6041df Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 12:18:12 +0300 Subject: [PATCH 202/290] Add json schema tests to contract controller --- .../api/rpc/contract_controller_test.exs | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs index e070cf8e57..22b711d9d3 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs @@ -17,6 +17,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "invalid is not a valid value for `filter`. Please use one of: verified, decompiled, unverified, not_decompiled, 1, 2, 3, 4." assert response["status"] == "0" + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "with no contracts", %{conn: conn, params: params} do @@ -28,6 +29,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["message"] == "OK" assert response["status"] == "1" assert response["result"] == [] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "with a verified smart contract, all contract information is shown", %{conn: conn, params: params} do @@ -50,6 +52,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => if(contract.optimization, do: "1", else: "0") } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "with an unverified contract address, only basic information is shown", %{conn: conn, params: params} do @@ -72,6 +75,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only unverified contracts shows only unverified contracts", %{params: params, conn: conn} do @@ -95,6 +99,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only unverified contracts does not show self destructed contracts", %{ @@ -122,6 +127,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only verified contracts shows only verified contracts", %{params: params, conn: conn} do @@ -145,6 +151,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => if(contract.optimization, do: "1", else: "0") } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only decompiled contracts shows only decompiled contracts", %{params: params, conn: conn} do @@ -168,6 +175,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only decompiled contracts, with a decompiled with version filter", %{params: params, conn: conn} do @@ -191,6 +199,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only decompiled contracts, with a decompiled with version filter, where another decompiled version exists", @@ -216,6 +225,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do } in response["result"] refute to_string(non_match.address_hash) in Enum.map(response["result"], &Map.get(&1, "Address")) + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only not_decompiled (and by extension not verified contracts)", %{params: params, conn: conn} do @@ -240,6 +250,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end test "filtering for only not_decompiled (and by extension not verified contracts) does not show empty contracts", %{ @@ -268,6 +279,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end end @@ -287,6 +299,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getabi_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -305,6 +318,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getabi_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -322,6 +336,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["result"] == nil assert response["status"] == "0" assert response["message"] == "Contract source code not verified" + assert :ok = ExJsonSchema.Validator.validate(getabi_schema(), response) end test "with a verified contract address", %{conn: conn} do @@ -341,6 +356,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["result"] == Jason.encode!(contract.abi) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getabi_schema(), response) end end @@ -360,6 +376,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getsourcecode_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -378,6 +395,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getsourcecode_schema(), response) end test "with an address that doesn't exist", %{conn: conn} do @@ -408,6 +426,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getsourcecode_schema(), response) end test "with a verified contract address", %{conn: conn} do @@ -443,6 +462,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getsourcecode_schema(), response) end end @@ -481,6 +501,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert response["status"] == "1" assert response["result"] == expected_result assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(verify_schema(), response) end test "with external libraries", %{conn: conn} do @@ -539,6 +560,76 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do assert result["DecompiledSourceCode"] == "Contract source code not decompiled." assert result["DecompilerVersion"] == "" assert result["OptimizationUsed"] == "1" + assert :ok = ExJsonSchema.Validator.validate(verify_schema(), response) end end + + defp listcontracts_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "Address" => %{"type" => "string"}, + "ABI" => %{"type" => "string"}, + "ContractName" => %{"type" => "string"}, + "CompilerVersion" => %{"type" => "string"}, + "OptimizationUsed" => %{"type" => "string"} + } + } + }) + end + + defp getabi_schema do + resolve_schema(%{ + "type" => ["string", "null"] + }) + end + + defp getsourcecode_schema do + resolve_schema(%{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "Address" => %{"type" => "string"}, + "SourceCode" => %{"type" => "string"}, + "ABI" => %{"type" => "string"}, + "ContractName" => %{"type" => "string"}, + "CompilerVersion" => %{"type" => "string"}, + "OptimizationUsed" => %{"type" => "string"}, + "DecompiledSourceCode" => %{"type" => "string"}, + "DecompilerVersion" => %{"type" => "string"} + } + } + }) + end + + defp verify_schema do + resolve_schema(%{ + "type" => "object", + "properties" => %{ + "Address" => %{"type" => "string"}, + "SourceCode" => %{"type" => "string"}, + "ABI" => %{"type" => "string"}, + "ContractName" => %{"type" => "string"}, + "CompilerVersion" => %{"type" => "string"}, + "DecompiledSourceCode" => %{"type" => "string"}, + "DecompilerVersion" => %{"type" => "string"}, + "OptimizationUsed" => %{"type" => "string"} + } + }) + end + + defp resolve_schema(result \\ %{}) do + %{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"} + } + } + |> put_in(["properties", "result"], result) + |> ExJsonSchema.Schema.resolve() + end end From abb7f2693f60ea12dae24150acd952e0ac4b27a7 Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 12:18:29 +0300 Subject: [PATCH 203/290] add json schema tests to logs controller --- .../api/rpc/logs_controller_test.exs | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs index 454db88e86..0b129939b8 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/logs_controller_test.exs @@ -22,6 +22,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "without fromBlock", %{conn: conn} do @@ -43,6 +44,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "without toBlock", %{conn: conn} do @@ -64,6 +66,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "without address and topic{x}", %{conn: conn} do @@ -85,6 +88,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "without topic{x}_{x}_opr", %{conn: conn} do @@ -118,6 +122,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end end @@ -146,6 +151,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with invalid fromBlock", %{conn: conn} do @@ -166,6 +172,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with invalid toBlock", %{conn: conn} do @@ -186,6 +193,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with an invalid address hash", %{conn: conn} do @@ -206,6 +214,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with invalid topic{x}_{x}_opr", %{conn: conn} do @@ -238,6 +247,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end end @@ -258,6 +268,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["result"] == [] assert response["status"] == "0" assert response["message"] == "No logs found" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with a valid contract address", %{conn: conn} do @@ -302,6 +313,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "ignores logs with block below fromBlock", %{conn: conn} do @@ -340,6 +352,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) [found_log] = response["result"] @@ -383,6 +396,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) [found_log] = response["result"] @@ -445,6 +459,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with a topic{x} AND another", %{conn: conn} do @@ -493,6 +508,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert found_log["topics"] == get_topics(log1) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with a topic{x} OR another", %{conn: conn} do @@ -540,6 +556,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert length(result) == 2 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end test "with all available 'topic{x}'s and 'topic{x}_{x}_opr's", %{conn: conn} do @@ -598,6 +615,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do assert length(result) == 2 assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response) end end @@ -771,4 +789,32 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do |> DateTime.to_unix() |> integer_to_hex() end + + defp getlogs_schema do + ExJsonSchema.Schema.resolve(%{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"}, + "result" => %{ + "type" => ["array", "null"], + "items" => %{ + "type" => "object", + "properties" => %{ + "address" => %{"type" => "string"}, + "topics" => %{"type" => "array", "items" => %{"type" => ["string", "null"]}}, + "data" => %{"type" => "string"}, + "blockNumber" => %{"type" => "string"}, + "timeStamp" => %{"type" => "string"}, + "gasPrice" => %{"type" => "string"}, + "gasUsed" => %{"type" => "string"}, + "logIndex" => %{"type" => "string"}, + "transactionHash" => %{"type" => "string"}, + "transactionIndex" => %{"type" => "string"} + } + } + } + } + }) + end end From d0b59997e76e331c0698c53800b535ddb94609a7 Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 12:18:41 +0300 Subject: [PATCH 204/290] add json schema tests to stats controller --- .../api/rpc/stats_controller_test.exs | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs index 9a7c26e9ee..bf3b82a3cb 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/stats_controller_test.exs @@ -23,6 +23,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokensupply_schema(), response) end test "with an invalid contractaddress hash", %{conn: conn} do @@ -41,6 +42,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokensupply_schema(), response) end test "with a contractaddress that doesn't exist", %{conn: conn} do @@ -59,6 +61,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["status"] == "0" assert Map.has_key?(response, "result") refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(tokensupply_schema(), response) end test "with valid contractaddress", %{conn: conn} do @@ -78,6 +81,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["result"] == to_string(token.total_supply) assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(tokensupply_schema(), response) end end @@ -96,6 +100,7 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["result"] == "252460800000000000000000000" assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(ethsupply_schema(), response) end end @@ -158,6 +163,43 @@ defmodule BlockScoutWeb.API.RPC.StatsControllerTest do assert response["result"] == expected_result assert response["status"] == "1" assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(ethprice_schema(), response) end end + + defp tokensupply_schema do + resolve_schema(%{ + "type" => ["string", "null"] + }) + end + + defp ethsupply_schema do + resolve_schema(%{ + "type" => ["string", "null"] + }) + end + + defp ethprice_schema do + resolve_schema(%{ + "type" => "object", + "properties" => %{ + "ethbtc" => %{"type" => "string"}, + "ethbtc_timestamp" => %{"type" => "string"}, + "ethusd" => %{"type" => "string"}, + "ethusd_timestamp" => %{"type" => "string"} + } + }) + end + + defp resolve_schema(result \\ %{}) do + %{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"} + } + } + |> put_in(["properties", "result"], result) + |> ExJsonSchema.Schema.resolve() + end end From a753e1467b475789e51a875ca79283fd24163b21 Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 12:18:54 +0300 Subject: [PATCH 205/290] add json schema tests to token controller --- .../api/rpc/token_controller_test.exs | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/token_controller_test.exs index 88196b8e40..a640a87441 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/token_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/token_controller_test.exs @@ -84,4 +84,26 @@ defmodule BlockScoutWeb.API.RPC.TokenControllerTest do assert response["message"] == "OK" end end + + defp gettoken_schema do + ExJsonSchema.Schema.resolve(%{ + "type" => "object", + "properties" => %{ + "message" => %{"type" => "string"}, + "status" => %{"type" => "string"}, + "result" => %{ + "type" => "object", + "properties" => %{ + "name" => %{"type" => "string"}, + "symbol" => %{"type" => "string"}, + "totalSupply" => %{"type" => "string"}, + "decimals" => %{"type" => "string"}, + "type" => %{"type" => "string"}, + "cataloged" => %{"type" => "string"}, + "contractAddress" => %{"type" => "string"} + } + } + } + }) + end end From c76b7525da37a4830ff6ebb48f3fe35d8f710f08 Mon Sep 17 00:00:00 2001 From: saneery Date: Sun, 18 Aug 2019 12:23:38 +0300 Subject: [PATCH 206/290] mix format --- .../controllers/api/rpc/contract_controller_test.exs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs index 22b711d9d3..3fbd1713bb 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs @@ -52,6 +52,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => if(contract.optimization, do: "1", else: "0") } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -75,6 +76,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -99,6 +101,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -127,6 +130,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -151,6 +155,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => if(contract.optimization, do: "1", else: "0") } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -175,6 +180,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -199,6 +205,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -250,6 +257,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end @@ -279,6 +287,7 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do "OptimizationUsed" => "" } ] + assert :ok = ExJsonSchema.Validator.validate(listcontracts_schema(), response) end end From fac326502500c90fa0db30f151ef77d663be80d0 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 19 Aug 2019 11:19:19 +0300 Subject: [PATCH 207/290] change branch for absinthe phoenix In the PR (https://github.com/poanetwork/blockscout/pull/2516) we broke backward compatability with old blockscout releases. Now, we will use new fork branches for absinthe deps forks in current releases and return old forks to the old state to maintain backward compatability. --- apps/block_scout_web/mix.exs | 2 +- mix.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 27a1e6aa74..e3aef926cf 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -62,7 +62,7 @@ defmodule BlockScoutWeb.Mixfile do # GraphQL toolkit {:absinthe, "~> 1.4"}, # Integrates Absinthe subscriptions with Phoenix - {:absinthe_phoenix, git: "https://github.com/ayrat555/absinthe_phoenix.git", branch: "master"}, + {:absinthe_phoenix, git: "https://github.com/ayrat555/absinthe_phoenix.git", branch: "ab-update-plug"}, # Plug support for Absinthe {:absinthe_plug, git: "https://github.com/ayrat555/absinthe_plug.git", branch: "ab-enable-default-query"}, # Absinthe support for the Relay framework diff --git a/mix.lock b/mix.lock index c85605b868..4f63710ad5 100644 --- a/mix.lock +++ b/mix.lock @@ -1,6 +1,6 @@ %{ "absinthe": {:hex, :absinthe, "1.4.16", "0933e4d9f12652b12115d5709c0293a1bf78a22578032e9ad0dad4efee6b9eb1", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, - "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "4dbb73a25a0935a4d292e63876698e18534d835f", [branch: "master"]}, + "absinthe_phoenix": {:git, "https://github.com/ayrat555/absinthe_phoenix.git", "4dbb73a25a0935a4d292e63876698e18534d835f", [branch: "ab-update-plug"]}, "absinthe_plug": {:git, "https://github.com/ayrat555/absinthe_plug.git", "cbe1c170e11e60b3b0146b925a1ce6ec562840ce", [branch: "ab-enable-default-query"]}, "absinthe_relay": {:hex, :absinthe_relay, "1.4.6", "ec0e2288994b388556247cf9601245abec785cdf206d6e844f2992d29de21624", [:mix], [{:absinthe, "~> 1.4.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"}, "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm"}, From c4ca6ba2b5d45f333f33712081dc03af07b4eb55 Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 19 Aug 2019 11:34:04 +0300 Subject: [PATCH 208/290] Fix error of url in API page --- apps/block_scout_web/assets/js/lib/try_api.js | 2 +- apps/block_scout_web/assets/js/lib/try_eth_api.js | 5 +++-- .../lib/block_scout_web/views/api_docs_view.ex | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/try_api.js b/apps/block_scout_web/assets/js/lib/try_api.js index c0eb8cd5e3..e6460f6c6b 100644 --- a/apps/block_scout_web/assets/js/lib/try_api.js +++ b/apps/block_scout_web/assets/js/lib/try_api.js @@ -124,7 +124,7 @@ $('button[data-try-api-ui-button-type="execute"]').click(event => { } $.ajax({ - url: `/api${query}`, + url: composeRequestUrl(query), success: (_data, _status, xhr) => { handleSuccess(query, xhr, clickedButton) }, diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js index a3dd7b6f4e..f6e1adffae 100644 --- a/apps/block_scout_web/assets/js/lib/try_eth_api.js +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -50,7 +50,6 @@ $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { const inputs = $(`input[data-selector="${module}-${action}-try-api-ui"]`) const params = $.map(inputs, parseInput) const formData = wrapJsonRpc(action, params) - console.log(formData) const loadingText = ' Loading...' clickedButton.prop('disabled', true) @@ -60,8 +59,10 @@ $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { clickedButton.html(loadingText) } + const url = $('[data-endpoint-url]').attr('data-endpoint-url') + $.ajax({ - url: '/api/eth_rpc', + url: url, type: 'POST', data: JSON.stringify(formData), dataType: 'json', diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index ac7d4d55ee..895fad79c2 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.APIDocsView do use BlockScoutWeb, :view - alias BlockScoutWeb.{Endpoint, LayoutView} + alias BlockScoutWeb.LayoutView def action_tile_id(module, action) do "#{module}-#{action}" @@ -41,9 +41,10 @@ defmodule BlockScoutWeb.APIDocsView do scheme = url_params[:scheme] if host != "localhost" do - scheme <> "://" <> host <> path + "#{scheme}://#{host}#{path}" else - Endpoint.url() + port = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:http][:port] + "#{scheme}://#{host}:#{to_string(port)}#{path}" end end From 7270b32ffb959ade1480a945b6a578bf3eeb251e Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 19 Aug 2019 11:43:56 +0300 Subject: [PATCH 209/290] Add double quotes to example of API call --- .../block_scout_web/templates/api_docs/_eth_rpc_item.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex index 7f342b4a16..57f96e42e0 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex @@ -6,7 +6,7 @@ - curl -X POST --data '{"id":0,"jsonrpc":"2.0","method": "<%= @action %>", params: []}' + curl -X POST --data '{"id":0,"jsonrpc":"2.0","method": "<%= @action %>", "params": []}'

    From 13058bea30d7afc79f9303bcd4f72b57b8a20166 Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 19 Aug 2019 11:47:51 +0300 Subject: [PATCH 210/290] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f006769dbf..649b476ec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2591](https://github.com/poanetwork/blockscout/pull/2591) - Fix url error in API page - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload - [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter From c363cf4f1eaf1ebeba28e87de987d38bec78c8c0 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 19 Aug 2019 11:54:44 +0300 Subject: [PATCH 211/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f006769dbf..53748f3cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases - [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix From 642cfd01cd1bfcb157fb4a3646208c4fbf2e0a45 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 19 Aug 2019 14:10:13 +0300 Subject: [PATCH 212/290] process new metadata format for whisper Solidity >= 0.5.11 has new whisper metadata format Metadata: Update the swarm hash to the current specification, changes bzzr0 to bzzr1 and urls to use bzz-raw:// https://github.com/ethereum/solidity/blob/develop/Changelog.md#0511-2019-08-12 --- .../lib/explorer/smart_contract/verifier.ex | 8 ++++++ .../verifier/constructor_arguments.ex | 10 +++++++ .../explorer/smart_contract/verifier_test.exs | 27 +++++++++++++++++++ .../solidity_5.11_new_whisper_metadata.json | 7 +++++ 4 files changed, 52 insertions(+) create mode 100644 apps/explorer/test/support/fixture/smart_contract/solidity_5.11_new_whisper_metadata.json diff --git a/apps/explorer/lib/explorer/smart_contract/verifier.ex b/apps/explorer/lib/explorer/smart_contract/verifier.ex index 7aa9957bab..4c2daa680c 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier.ex @@ -115,6 +115,14 @@ defmodule Explorer.SmartContract.Verifier do |> Enum.reverse() |> :binary.list_to_bin() + # Solidity >= 0.5.11 https://github.com/ethereum/solidity/blob/develop/Changelog.md#0511-2019-08-12 + # Metadata: Update the swarm hash to the current specification, changes bzzr0 to bzzr1 and urls to use bzz-raw:// + "a265627a7a72315820" <> + <<_::binary-size(64)>> <> "64736f6c6343" <> <<_::binary-size(6)>> <> "0032" <> _constructor_arguments -> + extracted + |> Enum.reverse() + |> :binary.list_to_bin() + <> <> rest -> do_extract_bytecode([next | extracted], rest) end diff --git a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex index 61167a4559..6e25b3cc52 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex @@ -48,6 +48,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do extract_constructor_arguments(constructor_arguments, passed_constructor_arguments) end + # Solidity >= 0.5.11 https://github.com/ethereum/solidity/blob/develop/Changelog.md#0511-2019-08-12 + # Metadata: Update the swarm hash to the current specification, changes bzzr0 to bzzr1 and urls to use bzz-raw:// + "a265627a7a72315820" <> + <<_::binary-size(64)>> <> "64736f6c6343" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + if passed_constructor_arguments == constructor_arguments do + true + else + extract_constructor_arguments(constructor_arguments, passed_constructor_arguments) + end + <<>> -> passed_constructor_arguments == "" diff --git a/apps/explorer/test/explorer/smart_contract/verifier_test.exs b/apps/explorer/test/explorer/smart_contract/verifier_test.exs index 9633804c60..fba0622964 100644 --- a/apps/explorer/test/explorer/smart_contract/verifier_test.exs +++ b/apps/explorer/test/explorer/smart_contract/verifier_test.exs @@ -56,6 +56,33 @@ defmodule Explorer.SmartContract.VerifierTest do assert abi != nil end + test "verifies smart contract with new `whisper` metadata (bzz0 => bzz1) in solidity 0.5.11" do + contract_data = + "#{File.cwd!()}/test/support/fixture/smart_contract/solidity_5.11_new_whisper_metadata.json" + |> File.read!() + |> Jason.decode!() + + compiler_version = contract_data["compiler_version"] + name = contract_data["name"] + optimize = false + contract = contract_data["contract"] + expected_bytecode = contract_data["bytecode"] + evm_version = contract_data["evm_version"] + + contract_address = insert(:contract_address, contract_code: "0x" <> expected_bytecode) + + params = %{ + "contract_source_code" => contract, + "compiler_version" => compiler_version, + "evm_version" => evm_version, + "name" => name, + "optimization" => optimize + } + + assert {:ok, %{abi: abi}} = Verifier.evaluate_authenticity(contract_address.hash, params) + assert abi != nil + end + test "verifies smart contract with constructor arguments", %{ contract_code_info: contract_code_info } do diff --git a/apps/explorer/test/support/fixture/smart_contract/solidity_5.11_new_whisper_metadata.json b/apps/explorer/test/support/fixture/smart_contract/solidity_5.11_new_whisper_metadata.json new file mode 100644 index 0000000000..bd0301ef78 --- /dev/null +++ b/apps/explorer/test/support/fixture/smart_contract/solidity_5.11_new_whisper_metadata.json @@ -0,0 +1,7 @@ +{ + "bytecode": "608060405260043610610105576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100a7578063d4ee1d9011610076578063d4ee1d90146105dc578063dc39d06d14610633578063dd62ed3e146106a6578063f2fde38b1461072b57610105565b80638da5cb5b1461037857806395d89b41146103cf578063a9059cbb1461045f578063cae9ca51146104d257610105565b806323b872dd116100e357806323b872dd14610238578063313ce567146102cb57806370a08231146102fc57806379ba50971461036157610105565b806306fdde031461010a578063095ea7b31461019a57806318160ddd1461020d575b600080fd5b34801561011657600080fd5b5061011f61077c565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561015f578082015181840152602081019050610144565b50505050905090810190601f16801561018c5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101a657600080fd5b506101f3600480360360408110156101bd57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061081a565b604051808215151515815260200191505060405180910390f35b34801561021957600080fd5b5061022261090c565b6040518082815260200191505060405180910390f35b34801561024457600080fd5b506102b16004803603606081101561025b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610967565b604051808215151515815260200191505060405180910390f35b3480156102d757600080fd5b506102e0610c12565b604051808260ff1660ff16815260200191505060405180910390f35b34801561030857600080fd5b5061034b6004803603602081101561031f57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610c25565b6040518082815260200191505060405180910390f35b34801561036d57600080fd5b50610376610c6e565b005b34801561038457600080fd5b5061038d610e0b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156103db57600080fd5b506103e4610e30565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610424578082015181840152602081019050610409565b50505050905090810190601f1680156104515780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561046b57600080fd5b506104b86004803603604081101561048257600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610ece565b604051808215151515815260200191505060405180910390f35b3480156104de57600080fd5b506105c2600480360360608110156104f557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291908035906020019064010000000081111561053c57600080fd5b82018360208201111561054e57600080fd5b8035906020019184600183028401116401000000008311171561057057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050611069565b604051808215151515815260200191505060405180910390f35b3480156105e857600080fd5b506105f16112b8565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561063f57600080fd5b5061068c6004803603604081101561065657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506112de565b604051808215151515815260200191505060405180910390f35b3480156106b257600080fd5b50610715600480360360408110156106c957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050611440565b6040518082815260200191505060405180910390f35b34801561073757600080fd5b5061077a6004803603602081101561074e57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506114c7565b005b60038054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108125780601f106107e757610100808354040283529160200191610812565b820191906000526020600020905b8154815290600101906020018083116107f557829003601f168201915b505050505081565b600081600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b6000610962600660008073ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460055461156490919063ffffffff16565b905090565b60006109bb82600660008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461156490919063ffffffff16565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a8d82600760008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461156490919063ffffffff16565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b5f82600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461157e90919063ffffffff16565b600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b600460009054906101000a900460ff1681565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610cc857600080fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60028054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610ec65780601f10610e9b57610100808354040283529160200191610ec6565b820191906000526020600020905b815481529060010190602001808311610ea957829003601f168201915b505050505081565b6000610f2282600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461156490919063ffffffff16565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610fb782600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461157e90919063ffffffff16565b600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a36001905092915050565b600082600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925856040518082815260200191505060405180910390a38373ffffffffffffffffffffffffffffffffffffffff16638f4ffcb1338530866040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561124657808201518184015260208101905061122b565b50505050905090810190601f1680156112735780820380516001836020036101000a031916815260200191505b5095505050505050600060405180830381600087803b15801561129557600080fd5b505af11580156112a9573d6000803e3d6000fd5b50505050600190509392505050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461133957600080fd5b8273ffffffffffffffffffffffffffffffffffffffff1663a9059cbb6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050602060405180830381600087803b1580156113fd57600080fd5b505af1158015611411573d6000803e3d6000fd5b505050506040513d602081101561142757600080fd5b8101908080519060200190929190505050905092915050565b6000600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461152057600080fd5b80600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008282111561157357600080fd5b818303905092915050565b600081830190508281101561159257600080fd5b9291505056fea265627a7a7231582073fbadbc806cc1f3349b3f98d58b62f7fa417e82d98f41bafd3dd9f9be4e4fa764736f6c634300050b0032", + "compiler_version": "v0.5.11+commit.c082d0b4", + "contract": "/**\r\n *Submitted for verification at Etherscan.io on 2019-08-16\r\n*/\r\n\r\npragma solidity ^0.5.0;\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// 'FIXED' 'Example Fixed Supply Token' token contract\r\n\r\n//\r\n\r\n// Symbol : FIXED\r\n\r\n// Name : Example Fixed Supply Token\r\n\r\n// Total supply: 1,000,000.000000000000000000\r\n\r\n// Decimals : 18\r\n\r\n//\r\n\r\n// Enjoy.\r\n\r\n//\r\n\r\n// (c) BokkyPooBah / Bok Consulting Pty Ltd 2018. The MIT Licence.\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// Safe maths\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\nlibrary SafeMath {\r\n\r\n function add(uint a, uint b) internal pure returns (uint c) {\r\n\r\n c = a + b;\r\n\r\n require(c >= a);\r\n\r\n }\r\n\r\n function sub(uint a, uint b) internal pure returns (uint c) {\r\n\r\n require(b <= a);\r\n\r\n c = a - b;\r\n\r\n }\r\n\r\n function mul(uint a, uint b) internal pure returns (uint c) {\r\n\r\n c = a * b;\r\n\r\n require(a == 0 || c / a == b);\r\n\r\n }\r\n\r\n function div(uint a, uint b) internal pure returns (uint c) {\r\n\r\n require(b > 0);\r\n\r\n c = a / b;\r\n\r\n }\r\n\r\n}\r\n\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// ERC Token Standard #20 Interface\r\n\r\n// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\ncontract ERC20Interface {\r\n\r\n function totalSupply() public view returns (uint);\r\n\r\n function balanceOf(address tokenOwner) public view returns (uint balance);\r\n\r\n function allowance(address tokenOwner, address spender) public view returns (uint remaining);\r\n\r\n function transfer(address to, uint tokens) public returns (bool success);\r\n\r\n function approve(address spender, uint tokens) public returns (bool success);\r\n\r\n function transferFrom(address from, address to, uint tokens) public returns (bool success);\r\n\r\n\r\n event Transfer(address indexed from, address indexed to, uint tokens);\r\n\r\n event Approval(address indexed tokenOwner, address indexed spender, uint tokens);\r\n\r\n}\r\n\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// Contract function to receive approval and execute function in one call\r\n\r\n//\r\n\r\n// Borrowed from MiniMeToken\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\ncontract ApproveAndCallFallBack {\r\n\r\n function receiveApproval(address from, uint256 tokens, address token, bytes memory data) public;\r\n\r\n}\r\n\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// Owned contract\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\ncontract Owned {\r\n\r\n address public owner;\r\n\r\n address public newOwner;\r\n\r\n\r\n event OwnershipTransferred(address indexed _from, address indexed _to);\r\n\r\n\r\n constructor() public {\r\n\r\n owner = msg.sender;\r\n\r\n }\r\n\r\n\r\n modifier onlyOwner {\r\n\r\n require(msg.sender == owner);\r\n\r\n _;\r\n\r\n }\r\n\r\n\r\n function transferOwnership(address _newOwner) public onlyOwner {\r\n\r\n newOwner = _newOwner;\r\n\r\n }\r\n\r\n function acceptOwnership() public {\r\n\r\n require(msg.sender == newOwner);\r\n\r\n emit OwnershipTransferred(owner, newOwner);\r\n\r\n owner = newOwner;\r\n\r\n newOwner = address(0);\r\n\r\n }\r\n\r\n}\r\n\r\n\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\n// ERC20 Token, with the addition of symbol, name and decimals and a\r\n\r\n// fixed supply\r\n\r\n// ----------------------------------------------------------------------------\r\n\r\ncontract FixedSupplyToken is ERC20Interface, Owned {\r\n\r\n using SafeMath for uint;\r\n\r\n\r\n string public symbol;\r\n\r\n string public name;\r\n\r\n uint8 public decimals;\r\n\r\n uint _totalSupply;\r\n\r\n\r\n mapping(address => uint) balances;\r\n\r\n mapping(address => mapping(address => uint)) allowed;\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Constructor\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n constructor() public {\r\n\r\n symbol = \"TEST\";\r\n\r\n name = \"Test Token\";\r\n\r\n decimals = 18;\r\n\r\n _totalSupply = 1000000 * 10**uint(decimals);\r\n\r\n balances[owner] = _totalSupply;\r\n\r\n emit Transfer(address(0), owner, _totalSupply);\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Total supply\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function totalSupply() public view returns (uint) {\r\n\r\n return _totalSupply.sub(balances[address(0)]);\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Get the token balance for account `tokenOwner`\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function balanceOf(address tokenOwner) public view returns (uint balance) {\r\n\r\n return balances[tokenOwner];\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Transfer the balance from token owner's account to `to` account\r\n\r\n // - Owner's account must have sufficient balance to transfer\r\n\r\n // - 0 value transfers are allowed\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function transfer(address to, uint tokens) public returns (bool success) {\r\n\r\n balances[msg.sender] = balances[msg.sender].sub(tokens);\r\n\r\n balances[to] = balances[to].add(tokens);\r\n\r\n emit Transfer(msg.sender, to, tokens);\r\n\r\n return true;\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Token owner can approve for `spender` to transferFrom(...) `tokens`\r\n\r\n // from the token owner's account\r\n\r\n //\r\n\r\n // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20-token-standard.md\r\n\r\n // recommends that there are no checks for the approval double-spend attack\r\n\r\n // as this should be implemented in user interfaces\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function approve(address spender, uint tokens) public returns (bool success) {\r\n\r\n allowed[msg.sender][spender] = tokens;\r\n\r\n emit Approval(msg.sender, spender, tokens);\r\n\r\n return true;\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Transfer `tokens` from the `from` account to the `to` account\r\n\r\n //\r\n\r\n // The calling account must already have sufficient tokens approve(...)-d\r\n\r\n // for spending from the `from` account and\r\n\r\n // - From account must have sufficient balance to transfer\r\n\r\n // - Spender must have sufficient allowance to transfer\r\n\r\n // - 0 value transfers are allowed\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function transferFrom(address from, address to, uint tokens) public returns (bool success) {\r\n\r\n balances[from] = balances[from].sub(tokens);\r\n\r\n allowed[from][msg.sender] = allowed[from][msg.sender].sub(tokens);\r\n\r\n balances[to] = balances[to].add(tokens);\r\n\r\n emit Transfer(from, to, tokens);\r\n\r\n return true;\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Returns the amount of tokens approved by the owner that can be\r\n\r\n // transferred to the spender's account\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function allowance(address tokenOwner, address spender) public view returns (uint remaining) {\r\n\r\n return allowed[tokenOwner][spender];\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Token owner can approve for `spender` to transferFrom(...) `tokens`\r\n\r\n // from the token owner's account. The `spender` contract function\r\n\r\n // `receiveApproval(...)` is then executed\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function approveAndCall(address spender, uint tokens, bytes memory data) public returns (bool success) {\r\n\r\n allowed[msg.sender][spender] = tokens;\r\n\r\n emit Approval(msg.sender, spender, tokens);\r\n\r\n ApproveAndCallFallBack(spender).receiveApproval(msg.sender, tokens, address(this), data);\r\n\r\n return true;\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Don't accept ETH\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function () external payable {\r\n\r\n revert();\r\n\r\n }\r\n\r\n\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n // Owner can transfer out any accidentally sent ERC20 tokens\r\n\r\n // ------------------------------------------------------------------------\r\n\r\n function transferAnyERC20Token(address tokenAddress, uint tokens) public onlyOwner returns (bool success) {\r\n\r\n return ERC20Interface(tokenAddress).transfer(owner, tokens);\r\n\r\n }\r\n\r\n}", + "name": "FixedSupplyToken", + "evm_version": "byzantium" +} From 6f24e25fc80f2fbcd16feccfd37d5e189cb89a1e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 19 Aug 2019 14:14:39 +0300 Subject: [PATCH 213/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f006769dbf..ff2fbeddb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload - [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter From 14f099b5b35b219873751e184d631bcf234c3a73 Mon Sep 17 00:00:00 2001 From: saneery Date: Mon, 19 Aug 2019 17:11:29 +0300 Subject: [PATCH 214/290] remove additional path in local url --- apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index 895fad79c2..382a7b26b9 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -44,7 +44,7 @@ defmodule BlockScoutWeb.APIDocsView do "#{scheme}://#{host}#{path}" else port = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:http][:port] - "#{scheme}://#{host}:#{to_string(port)}#{path}" + "#{scheme}://#{host}:#{to_string(port)}" end end From f1c1e066a7803cd56305ad602fbeb5705c27e699 Mon Sep 17 00:00:00 2001 From: saneery Date: Tue, 20 Aug 2019 10:39:40 +0300 Subject: [PATCH 215/290] Add double quotes to copying string --- .../block_scout_web/templates/api_docs/_eth_rpc_item.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex index 57f96e42e0..f464533c7e 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex @@ -4,7 +4,7 @@

    <%= @action %>

    <%= raw @info.notes %>

    curl -X POST --data '{"id":0,"jsonrpc":"2.0","method": "<%= @action %>", "params": []}' From 0c1963770c6b8012d34fb09ff53d76712cbb38d2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 10:45:09 +0300 Subject: [PATCH 216/290] add CR issues --- .../templates/address_logs/_logs.html.eex | 2 +- .../templates/transaction_log/_logs.html.eex | 2 +- apps/explorer/lib/explorer/chain/log.ex | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index cf19ea6420..527a63feab 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -10,7 +10,7 @@ <%= gettext "Verify the contract " %><%= gettext "here" %> <% _ -> %> <%= nil %> - <% end %> + <% end %>
    <% _ -> %> <%= nil %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index a0922454a9..49a18bf84d 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -9,7 +9,7 @@ <%= gettext "Verify the contract " %><%= gettext "here" %> <% _ -> %> <%= nil %> - <% end %> + <% end %> <% _ -> %> <%= nil %> diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index f84c59c38d..0c9b2087ce 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -118,9 +118,14 @@ defmodule Explorer.Chain.Log do def decode(log, transaction) do case log.first_topic do "0x" <> hex_part -> - {number, ""} = Integer.parse(hex_part, 16) - <> = :binary.encode_unsigned(number) - find_candidates(method_id, log, transaction) + case Integer.parse(hex_part, 16) do + {number, ""} -> + <> = :binary.encode_unsigned(number) + find_candidates(method_id, log, transaction) + + _ -> + {:error, :could_not_decode} + end _ -> {:error, :could_not_decode} From 2b6f7eff784c2520731b1cf451fc044e3ffb862e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 11:06:40 +0300 Subject: [PATCH 217/290] do not start genesis data fetching periodically From this point genesis data fetching will start and will be retried on a task failure. Also, this PR disables genesis data fetcher process by default because most our users won't know that they should set chain spec for it. --- apps/explorer/config/config.exs | 2 +- apps/explorer/lib/explorer/chain_spec/genesis_data.ex | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index 95c80ba445..93298073e0 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -27,7 +27,7 @@ config :explorer, Explorer.Counters.AverageBlockTime, enabled: true, period: average_block_period -config :explorer, Explorer.ChainSpec.GenesisData, enabled: true, chain_spec_path: System.get_env("CHAIN_SPEC_PATH") +config :explorer, Explorer.ChainSpec.GenesisData, enabled: false, chain_spec_path: System.get_env("CHAIN_SPEC_PATH") config :explorer, Explorer.Chain.Cache.BlockNumber, enabled: true diff --git a/apps/explorer/lib/explorer/chain_spec/genesis_data.ex b/apps/explorer/lib/explorer/chain_spec/genesis_data.ex index a156aae6d7..690be2eb19 100644 --- a/apps/explorer/lib/explorer/chain_spec/genesis_data.ex +++ b/apps/explorer/lib/explorer/chain_spec/genesis_data.ex @@ -18,7 +18,6 @@ defmodule Explorer.ChainSpec.GenesisData do @impl GenServer def init(_) do - :timer.send_interval(@interval, :import) Process.send_after(self(), :import, @interval) {:ok, %{}} From 80186d3ce8443c1655c7b6bf76c048a257f66dc2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 11:10:52 +0300 Subject: [PATCH 218/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a49616a0a5..a8b6d16ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically - [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases - [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error - [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix From 18848fe472c5f999e544dd79f9a9de3e1fed7894 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 12:40:30 +0300 Subject: [PATCH 219/290] use older version of phoenix framework In the PR (https://github.com/poanetwork/blockscout/pull/2566) phoenix was updated to `1.4.9`. But apparently new changes cause web socket connection to disconnect and connect again which shows `Connection Closed` message. We should investigate this issue and update phoenix framework after that - https://github.com/poanetwork/blockscout/issues/2595 --- apps/block_scout_web/mix.exs | 2 +- mix.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index e54907177f..de55cb0eb7 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -99,7 +99,7 @@ defmodule BlockScoutWeb.Mixfile do {:logger_file_backend, "~> 0.0.10"}, {:math, "~> 0.3.0"}, {:mock, "~> 0.3.0", only: [:test], runtime: false}, - {:phoenix, "~> 1.4"}, + {:phoenix, "== 1.4.0"}, {:phoenix_ecto, "~> 4.0"}, {:phoenix_html, "~> 2.10"}, {:phoenix_live_reload, "~> 1.2", only: [:dev]}, diff --git a/mix.lock b/mix.lock index d589137148..e0d75af01a 100644 --- a/mix.lock +++ b/mix.lock @@ -81,7 +81,7 @@ "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm"}, "parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], [], "hexpm"}, "parse_trans": {:hex, :parse_trans, "3.2.0", "2adfa4daf80c14dc36f522cf190eb5c4ee3e28008fc6394397c16f62a26258c2", [:rebar3], [], "hexpm"}, - "phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, + "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"}, "phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "phoenix_form_awesomplete": {:hex, :phoenix_form_awesomplete, "0.1.5", "d09aade160b584e3428e1e095645482396f17bddda4f566f1118f12d2598d11c", [:mix], [{:phoenix_html, "~> 2.10", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm"}, "phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, From d1a8e7f5130a2b014a2556e998db6b23cbc55273 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 13:45:11 +0300 Subject: [PATCH 220/290] add AuRa's empty step reward type Instead of producing empty blocks nodes in Aura consensus protocol broadcast an EmptyStep(step, parent_hash) message. https://github.com/paritytech/wiki/blob/master/Aura.md#empty-steps --- .../lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex index fea1a4c8aa..b2a90d53bc 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex @@ -182,4 +182,5 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do defp get_address_type(reward_type, index) when reward_type == "external" and index == 10, do: :validator defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle + defp get_address_type(reward_type, _index) when reward_type == "emptyStep", do: :validator end From de564dea01a940b31a528e80053ab1f6ab42cf97 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 20 Aug 2019 13:49:43 +0300 Subject: [PATCH 221/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a49616a0a5..c691326fb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type - [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method - [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation From 0a647d0acbe3cfcb8b575cf92d420f6ae3268582 Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 21 Aug 2019 12:06:20 +0300 Subject: [PATCH 222/290] Remove schema from api url --- apps/block_scout_web/assets/js/lib/try_api.js | 6 +++++- apps/block_scout_web/assets/js/lib/try_eth_api.js | 6 +++++- .../lib/block_scout_web/views/api_docs_view.ex | 5 ++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/try_api.js b/apps/block_scout_web/assets/js/lib/try_api.js index e6460f6c6b..02d82a65ef 100644 --- a/apps/block_scout_web/assets/js/lib/try_api.js +++ b/apps/block_scout_web/assets/js/lib/try_api.js @@ -55,6 +55,10 @@ function handleSuccess (query, xhr, clickedButton) { clickedButton.prop('disabled', false) } +function dropDomain (url) { + return url.split('/').slice(1).join('/') +} + // Show 'Try it out' UI for a module/action. $('button[data-selector*="btn-try-api"]').click(event => { const clickedButton = $(event.target) @@ -124,7 +128,7 @@ $('button[data-try-api-ui-button-type="execute"]').click(event => { } $.ajax({ - url: composeRequestUrl(query), + url: '/' + dropDomain(composeRequestUrl(query)), success: (_data, _status, xhr) => { handleSuccess(query, xhr, clickedButton) }, diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js index f6e1adffae..464229885d 100644 --- a/apps/block_scout_web/assets/js/lib/try_eth_api.js +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -43,6 +43,10 @@ function parseInput (input) { } } +function dropDomain (url) { + return url.split('/').slice(1).join('/') +} + $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { const clickedButton = $(event.target) const module = clickedButton.attr('data-module') @@ -62,7 +66,7 @@ $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { const url = $('[data-endpoint-url]').attr('data-endpoint-url') $.ajax({ - url: url, + url: '/' + dropDomain(url), type: 'POST', data: JSON.stringify(formData), dataType: 'json', diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index 382a7b26b9..6f731d3627 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -38,13 +38,12 @@ defmodule BlockScoutWeb.APIDocsView do url_params = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url] host = url_params[:host] path = url_params[:path] - scheme = url_params[:scheme] if host != "localhost" do - "#{scheme}://#{host}#{path}" + "#{host}#{path}" else port = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:http][:port] - "#{scheme}://#{host}:#{to_string(port)}" + "#{host}:#{to_string(port)}" end end From 0da2afb1caafac30fa3d1ac21c6fff61f9f10975 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 12:15:04 +0300 Subject: [PATCH 223/290] use CoinGecko instead of CoinMarketcap for exchange rates CoinMarketcap deprecated and took offline its v1 API. They have v2 API which has free plan and requires API keys. But as part of https://github.com/poanetwork/blockscout/issues/234 we alresy implemented fetching from CoinGecko. Now, coin id should be set for CoinGecko for the required coin. ``` config :explorer, Explorer.ExchangeRates.Source.CoinGecko, coin_id: System.get_env("COIN_GECKO_ID", "poa-network") ``` Or the `COIN_GECKO_ID` env var should be set. For example, COIN_GECKO_ID=poa-network --- apps/explorer/config/config.exs | 2 + apps/explorer/lib/explorer/chain.ex | 2 +- .../{coin_market_cap.ex => exchange_rate.ex} | 4 +- .../lib/explorer/exchange_rates/source.ex | 2 +- .../exchange_rates/source/coin_gecko.ex | 38 +++++++++++-------- 5 files changed, 28 insertions(+), 20 deletions(-) rename apps/explorer/lib/explorer/chain/supply/{coin_market_cap.ex => exchange_rate.ex} (72%) diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index 95c80ba445..87b57d5f82 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -34,6 +34,8 @@ config :explorer, Explorer.Chain.Cache.BlockNumber, enabled: true config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap, pages: String.to_integer(System.get_env("COINMARKETCAP_PAGES") || "10") +config :explorer, Explorer.ExchangeRates.Source.CoinGecko, coin_id: System.get_env("COIN_GECKO_ID", "poa-network") + balances_update_interval = if System.get_env("ADDRESS_WITH_BALANCES_UPDATE_INTERVAL") do case Integer.parse(System.get_env("ADDRESS_WITH_BALANCES_UPDATE_INTERVAL")) do diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 58253c0f27..90df61749c 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2717,7 +2717,7 @@ defmodule Explorer.Chain do end defp supply_module do - Application.get_env(:explorer, :supply, Explorer.Chain.Supply.CoinMarketCap) + Application.get_env(:explorer, :supply, Explorer.Chain.Supply.ExchangeRate) end @doc """ diff --git a/apps/explorer/lib/explorer/chain/supply/coin_market_cap.ex b/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex similarity index 72% rename from apps/explorer/lib/explorer/chain/supply/coin_market_cap.ex rename to apps/explorer/lib/explorer/chain/supply/exchange_rate.ex index ebaadb3c47..d45a8edc02 100644 --- a/apps/explorer/lib/explorer/chain/supply/coin_market_cap.ex +++ b/apps/explorer/lib/explorer/chain/supply/exchange_rate.ex @@ -1,6 +1,6 @@ -defmodule Explorer.Chain.Supply.CoinMarketCap do +defmodule Explorer.Chain.Supply.ExchangeRate do @moduledoc """ - Defines the supply API for calculating supply for coins from coinmarketcap. + Defines the supply API for calculating supply for coins from exchange_rate.. """ use Explorer.Chain.Supply diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex index 41b87c1e29..d733b22222 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source.ex @@ -83,7 +83,7 @@ defmodule Explorer.ExchangeRates.Source do @spec exchange_rates_source() :: module() defp exchange_rates_source do - config(:source) || Explorer.ExchangeRates.Source.CoinMarketCap + config(:source) || Explorer.ExchangeRates.Source.CoinGecko end @spec config(atom()) :: term diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex index 4e59537bf6..f12eaca844 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex @@ -15,39 +15,45 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do {:ok, price} = get_btc_price() btc_price = to_decimal(price) - for item <- decode_json(data), - not is_nil(item["total_supply"]) and not is_nil(item["current_price"]) do - {:ok, last_updated, 0} = DateTime.from_iso8601(item["last_updated"]) + json_data = decode_json(data) - current_price = to_decimal(item["current_price"]) + market_data = json_data["market_data"] + {:ok, last_updated, 0} = DateTime.from_iso8601(market_data["last_updated"]) - id = item["id"] - btc_value = if id != "btc", do: Decimal.div(current_price, btc_price), else: 1 + current_price = to_decimal(market_data["current_price"]["usd"]) + id = json_data["id"] + btc_value = if id != "btc", do: Decimal.div(current_price, btc_price), else: 1 + + [ %Token{ - available_supply: to_decimal(item["total_supply"]), - total_supply: to_decimal(item["total_supply"]), + available_supply: to_decimal(market_data["circulating_supply"]), + total_supply: to_decimal(market_data["total_supply"]), btc_value: btc_value, - id: id, + id: json_data["id"], last_updated: last_updated, - market_cap_usd: to_decimal(item["market_cap"]), - name: item["name"], - symbol: item["symbol"], + market_cap_usd: to_decimal(market_data["market_cap"]["usd"]), + name: json_data["name"], + symbol: String.upcase(json_data["symbol"]), usd_value: current_price, - volume_24h_usd: to_decimal(item["total_volume"]) + volume_24h_usd: to_decimal(market_data["total_volume"]["usd"]) } - end + ] end @impl Source - def source_url(currency \\ "usd") do - "#{base_url()}/coins/markets?vs_currency=#{currency}" + def source_url do + "#{base_url()}/coins/#{coin_id()}" end defp base_url do config(:base_url) || "https://api.coingecko.com/api/v3" end + defp coin_id do + Application.get_env(:explorer, __MODULE__)[:coin_id] + end + defp get_btc_price(currency \\ "usd") do url = "#{base_url()}/exchange_rates" From 6990cac077063258515be73e2867314a11a1dbd9 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 12:24:54 +0300 Subject: [PATCH 224/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a49616a0a5..d54e46cc71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2610](https://github.com/poanetwork/blockscout/pull/2610) - use CoinGecko instead of CoinMarketcap for exchange rates - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload - [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter From 8bae16459a7db6482bb8df42279248eb9a7546b5 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 12:28:05 +0300 Subject: [PATCH 225/290] add entry to env vars file --- docs/env-variables.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/env-variables.md b/docs/env-variables.md index 60c9eee442..5ede197596 100644 --- a/docs/env-variables.md +++ b/docs/env-variables.md @@ -53,6 +53,7 @@ $ export NETWORK=POA | `ADDRESS_WITH_BALANCES`
    `_UPDATE_INTERVAL`| | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 | v1.3.9+ | | `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer | (empty) | v1.3.0+ | | `COINMARKETCAP_PAGES` | | the number of pages on coinmarketcap to list in order to find token's price | 10 | v1.3.10+ | +| `COIN_GECKO_ID` | | CoinGecko coin id required for fetching an exchange rate | poa-network | master | | `CHAIN_SPEC_PATH` | | Chain specification path (absolute file system path or url) to import block emission reward ranges and genesis account balances from | (empty) | master | | `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects. | (empty) | v2.0.0+ | | `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876) | 600 | v2.0.0+ | From 1ddbbb4b4063090a4df352bf0a7459dc1cc758db Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 21 Aug 2019 12:41:24 +0300 Subject: [PATCH 226/290] fix tests --- .../block_scout_web/views/api_docs_view_test.exs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs index 7583aeaa4f..69be27ef09 100644 --- a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs @@ -17,7 +17,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/"] ) - assert APIDocsView.blockscout_url() == "https://blockscout.com/" + assert APIDocsView.blockscout_url() == "blockscout.com/" end test "returns url with scheme and host with path" do @@ -25,7 +25,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.blockscout_url() == "https://blockscout.com/chain/dog" + assert APIDocsView.blockscout_url() == "blockscout.com/chain/dog" end end @@ -43,7 +43,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.api_url() == "https://blockscout.com/chain/dog/api" + assert APIDocsView.api_url() == "blockscout.com/chain/dog/api" end test "does not add slash to empty path" do @@ -51,7 +51,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] ) - assert APIDocsView.api_url() == "https://blockscout.com/api" + assert APIDocsView.api_url() == "blockscout.com/api" end end @@ -69,7 +69,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.eth_rpc_api_url() == "https://blockscout.com/chain/dog/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url() == "blockscout.com/chain/dog/api/eth_rpc" end test "does not add slash to empty path" do @@ -77,7 +77,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] ) - assert APIDocsView.eth_rpc_api_url() == "https://blockscout.com/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url() == "blockscout.com/api/eth_rpc" end end end From c563ee363802bebc17672f13c96a9adaeaa49b89 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 13:28:44 +0300 Subject: [PATCH 227/290] fix CoinGecko tests --- .../exchange_rates/source/coin_gecko.ex | 5 +- .../exchange_rates/source/coin_gecko_test.exs | 57 +++++-------------- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex index f12eaca844..5b0bed2b3b 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex @@ -11,7 +11,7 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do @behaviour Source @impl Source - def format_data(data) do + def format_data(%{"market_data" => _} = data) do {:ok, price} = get_btc_price() btc_price = to_decimal(price) @@ -41,6 +41,9 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do ] end + @impl Source + def format_data(_), do: [] + @impl Source def source_url do "#{base_url()}/coins/#{coin_id()}" diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs index 3c2a9b6feb..b4b3313d6c 100644 --- a/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs +++ b/apps/explorer/test/explorer/exchange_rates/source/coin_gecko_test.exs @@ -18,34 +18,6 @@ defmodule Explorer.ExchangeRates.Source.CoinGeckoTest do } """ - @json_mkt_data """ - [ - { - "id": "poa-network", - "symbol": "poa", - "name": "POA Network", - "image": "https://assets.coingecko.com/coins/images/3157/large/poa.jpg?1520829019", - "current_price": 0.114782883773693, - "market_cap": 25248999.6735956, - "market_cap_rank": 185, - "total_volume": 2344442.13578437, - "high_24h": 0.115215129840519, - "low_24h": 0.101039753612939, - "price_change_24h": 0.0135970966607094, - "price_change_percentage_24h": 13.437753511298, - "market_cap_change_24h": 3058195.58191147, - "market_cap_change_percentage_24h": 13.7813644304017, - "circulating_supply": "219935174.0", - "total_supply": 252193195, - "ath": 0.935923393359191, - "ath_change_percentage": -87.731057963078, - "ath_date": "2018-05-10T09:45:31.809Z", - "roi": null, - "last_updated": "2018-10-23T01:25:31.764Z" - } - ] - """ - describe "format_data/1" do setup do bypass = Bypass.open() @@ -59,31 +31,30 @@ defmodule Explorer.ExchangeRates.Source.CoinGeckoTest do Conn.resp(conn, 200, @json_btc_price) end) - {:ok, expected_date, 0} = "2018-10-23T01:25:31.764Z" |> DateTime.from_iso8601() + json_data = + "#{File.cwd!()}/test/support/fixture/exchange_rates/coin_gecko.json" + |> File.read!() + |> Jason.decode!() expected = [ %Token{ - available_supply: Decimal.new("252193195"), - total_supply: Decimal.new("252193195"), - btc_value: Decimal.new("0.00001753101509231471092879666458"), + available_supply: Decimal.new("220167621.0"), + total_supply: Decimal.new("252193195.0"), + btc_value: Decimal.new("0.000002055310963802830367634997491"), id: "poa-network", - last_updated: expected_date, - market_cap_usd: Decimal.new("25248999.6735956"), + last_updated: ~U[2019-08-21 08:36:49.371Z], + market_cap_usd: Decimal.new("2962791"), name: "POA Network", - symbol: "poa", - usd_value: Decimal.new("0.114782883773693"), - volume_24h_usd: Decimal.new("2344442.13578437") + symbol: "POA", + usd_value: Decimal.new("0.01345698"), + volume_24h_usd: Decimal.new("119946") } ] - assert expected == CoinGecko.format_data(@json_mkt_data) + assert expected == CoinGecko.format_data(json_data) end - test "returns nothing when given bad data", %{bypass: bypass} do - Bypass.expect(bypass, "GET", "/exchange_rates", fn conn -> - Conn.resp(conn, 200, @json_btc_price) - end) - + test "returns nothing when given bad data" do bad_data = """ [{"id": "poa-network"}] """ From 61c65de470ee6dc6907613b19e24a7ce733ebe5d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 13:29:12 +0300 Subject: [PATCH 228/290] add example CoinGecko response --- .../fixture/exchange_rates/coin_gecko.json | 1806 +++++++++++++++++ 1 file changed, 1806 insertions(+) create mode 100644 apps/explorer/test/support/fixture/exchange_rates/coin_gecko.json diff --git a/apps/explorer/test/support/fixture/exchange_rates/coin_gecko.json b/apps/explorer/test/support/fixture/exchange_rates/coin_gecko.json new file mode 100644 index 0000000000..cc110eb402 --- /dev/null +++ b/apps/explorer/test/support/fixture/exchange_rates/coin_gecko.json @@ -0,0 +1,1806 @@ +{ + "asset_platform_id": null, + "block_time_in_minutes": 0, + "categories": [], + "coingecko_rank": 376, + "coingecko_score": 33.7, + "community_data": { + "facebook_likes": 0, + "reddit_accounts_active_48h": 0, + "reddit_average_comments_48h": 0.0, + "reddit_average_posts_48h": 0.0, + "reddit_subscribers": 0, + "telegram_channel_user_count": 5125, + "twitter_followers": 17737 + }, + "community_score": 9.403, + "country_origin": "", + "description": { + "ar": "", + "de": "", + "en": "", + "es": "", + "fr": "", + "hu": "", + "id": "", + "it": "", + "ja": "", + "ko": "", + "nl": "", + "pl": "", + "pt": "", + "ro": "", + "ru": "", + "sv": "", + "th": "", + "tr": "", + "vi": "", + "zh": "", + "zh-tw": "" + }, + "developer_data": { + "closed_issues": 0, + "code_additions_deletions_4_weeks": { + "additions": 0, + "deletions": 0 + }, + "commit_count_4_weeks": 0, + "forks": 44, + "last_4_weeks_commit_activity_series": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "pull_request_contributors": 6, + "pull_requests_merged": 133, + "stars": 58, + "subscribers": 8, + "total_issues": 0 + }, + "developer_score": 52.776, + "genesis_date": null, + "id": "poa-network", + "image": { + "large": "https://assets.coingecko.com/coins/images/3157/large/poa-network.png?1548331565", + "small": "https://assets.coingecko.com/coins/images/3157/small/poa-network.png?1548331565", + "thumb": "https://assets.coingecko.com/coins/images/3157/thumb/poa-network.png?1548331565" + }, + "last_updated": "2019-08-21T08:36:49.371Z", + "links": { + "announcement_url": [ + "", + "" + ], + "bitcointalk_thread_identifier": null, + "blockchain_site": [ + "https://blockscout.com/poa/core/", + "", + "", + "", + "" + ], + "chat_url": [ + "", + "", + "" + ], + "facebook_username": "", + "homepage": [ + "https://poa.network/", + "", + "" + ], + "official_forum_url": [ + "", + "", + "" + ], + "repos_url": { + "bitbucket": [], + "github": [ + "https://github.com/poanetwork/poa-network-consensus-contracts" + ] + }, + "subreddit_url": null, + "telegram_channel_identifier": "oraclesnetwork", + "twitter_screen_name": "poanetwork" + }, + "liquidity_score": 19.334, + "localization": { + "ar": "POA Network", + "de": "POA Network", + "en": "POA Network", + "es": "POA Network", + "fr": "POA Network", + "hu": "POA Network", + "id": "POA Network", + "it": "POA Network", + "ja": "ポアネットワーク", + "ko": "POA 네트워크", + "nl": "POA Network", + "pl": "POA Network", + "pt": "POA Network", + "ro": "POA Network", + "ru": "POA Network", + "sv": "POA Network", + "th": "POA Network", + "tr": "POA Network", + "vi": "POA Network", + "zh": "POA Network", + "zh-tw": "POA Network" + }, + "market_cap_rank": 499, + "market_data": { + "ath": { + "aed": 3.06, + "ars": 18.93, + "aud": 1.25, + "bch": 0.00076772, + "bdt": 70.74, + "bhd": 0.314495, + "bmd": 0.833914, + "bnb": 0.01322268, + "brl": 3.36, + "btc": 0.00010137, + "cad": 1.2, + "chf": 0.938803, + "clp": 519.58, + "cny": 5.94, + "czk": 17.83, + "dkk": 5.87, + "eos": 0.02444974, + "eth": 0.0011725, + "eur": 0.787803, + "gbp": 0.689151, + "hkd": 7.35, + "huf": 219.96, + "idr": 13179.33, + "ils": 2.97, + "inr": 62.94, + "jpy": 102.6, + "krw": 1000.83, + "kwd": 0.251571, + "lkr": 131.79, + "ltc": 0.00537407, + "mmk": 1125.41, + "mxn": 18.15, + "myr": 3.76, + "nok": 6.67, + "nzd": 1.35, + "php": 48.59, + "pkr": 96.55, + "pln": 3.34, + "rub": 58.27, + "sar": 3.13, + "sek": 8.13, + "sgd": 1.25, + "thb": 26.65, + "try": 3.54, + "twd": 27.89, + "uah": 1.44, + "usd": 0.935923, + "vef": 58307, + "vnd": 1281.67, + "xag": 0.056398, + "xau": 0.00071129, + "xdr": 0.656022, + "xlm": 0.58965135, + "xrp": 0.2920468, + "zar": 11.63 + }, + "ath_change_percentage": { + "aed": -98.3819, + "ars": -96.09901, + "aud": -98.40941, + "bch": -94.11046, + "bdt": -98.39058, + "bhd": -98.38261, + "bmd": -98.38194, + "bnb": -96.24179, + "brl": -98.37442, + "btc": -98.68937, + "cad": -98.49893, + "chf": -98.59269, + "clp": -98.15517, + "cny": -98.39701, + "czk": -98.2406, + "dkk": -98.45473, + "eos": -84.56025, + "eth": -93.8673, + "eur": -98.45627, + "gbp": -98.38711, + "hkd": -98.55948, + "huf": -98.18974, + "idr": -98.54127, + "ils": -98.39903, + "inr": -98.46908, + "jpy": -98.59899, + "krw": -98.37868, + "kwd": -98.3684, + "lkr": -98.16735, + "ltc": -96.51103, + "mmk": -98.17585, + "mxn": -98.53298, + "myr": -98.49907, + "nok": -98.18519, + "nzd": -98.43938, + "php": -98.54716, + "pkr": -97.76349, + "pln": -98.41583, + "rub": -98.4658, + "sar": -98.3821, + "sek": -98.39542, + "sgd": -98.51152, + "thb": -98.44172, + "try": -97.81784, + "twd": -98.48322, + "uah": -76.52065, + "usd": -98.5583, + "vef": -94.2496, + "vnd": -75.59837, + "xag": -98.59644, + "xau": -98.73411, + "xdr": -98.49988, + "xlm": -66.24383, + "xrp": -82.56607, + "zar": -98.23009 + }, + "ath_date": { + "aed": "2018-05-10T00:00:00.000Z", + "ars": "2018-05-10T00:00:00.000Z", + "aud": "2018-05-10T09:45:31.809Z", + "bch": "2018-04-14T00:00:00.000Z", + "bdt": "2018-05-10T00:00:00.000Z", + "bhd": "2018-05-10T00:00:00.000Z", + "bmd": "2018-05-10T00:00:00.000Z", + "bnb": "2018-10-16T12:40:17.749Z", + "brl": "2018-05-10T09:45:31.809Z", + "btc": "2018-05-10T09:45:31.809Z", + "cad": "2018-05-10T09:45:31.809Z", + "chf": "2018-05-10T09:45:31.809Z", + "clp": "2018-05-10T00:00:00.000Z", + "cny": "2018-05-10T09:45:31.809Z", + "czk": "2018-05-10T00:00:00.000Z", + "dkk": "2018-05-10T09:45:31.809Z", + "eos": "2018-10-16T12:40:17.749Z", + "eth": "2018-04-09T00:00:00.000Z", + "eur": "2018-05-10T09:45:31.809Z", + "gbp": "2018-05-10T09:45:31.809Z", + "hkd": "2018-05-10T09:45:31.809Z", + "huf": "2018-05-10T00:00:00.000Z", + "idr": "2018-05-10T09:45:31.809Z", + "ils": "2018-05-10T00:00:00.000Z", + "inr": "2018-05-10T09:45:31.809Z", + "jpy": "2018-05-10T09:45:31.809Z", + "krw": "2018-05-10T09:45:31.809Z", + "kwd": "2018-05-10T00:00:00.000Z", + "lkr": "2018-05-10T00:00:00.000Z", + "ltc": "2018-05-10T00:00:00.000Z", + "mmk": "2018-05-10T00:00:00.000Z", + "mxn": "2018-05-10T09:45:31.809Z", + "myr": "2018-05-10T09:45:31.809Z", + "nok": "2018-05-10T00:00:00.000Z", + "nzd": "2018-05-10T09:45:31.809Z", + "php": "2018-05-10T09:45:31.809Z", + "pkr": "2018-05-10T00:00:00.000Z", + "pln": "2018-05-10T09:45:31.809Z", + "rub": "2018-05-10T09:45:31.809Z", + "sar": "2018-05-10T00:00:00.000Z", + "sek": "2018-05-10T09:45:31.809Z", + "sgd": "2018-05-10T09:45:31.809Z", + "thb": "2018-05-10T00:00:00.000Z", + "try": "2018-05-10T00:00:00.000Z", + "twd": "2018-05-10T09:45:31.809Z", + "uah": "2019-05-27T12:49:29.532Z", + "usd": "2018-05-10T09:45:31.809Z", + "vef": "2018-05-10T00:00:00.000Z", + "vnd": "2019-05-27T12:49:29.532Z", + "xag": "2018-05-10T09:45:31.809Z", + "xau": "2018-05-10T09:45:31.809Z", + "xdr": "2018-05-10T09:45:31.809Z", + "xlm": "2018-10-16T12:49:26.379Z", + "xrp": "2018-10-16T12:40:17.749Z", + "zar": "2018-05-10T09:45:31.809Z" + }, + "circulating_supply": 220167621.0, + "current_price": { + "aed": 0.04942712, + "ars": 0.73641, + "aud": 0.0198328, + "bch": 4.486e-05, + "bdt": 1.14, + "bhd": 0.00507448, + "bmd": 0.01345698, + "bnb": 0.00049505, + "brl": 0.054544, + "btc": 1.32e-06, + "cad": 0.0178991, + "chf": 0.01317061, + "clp": 9.55, + "cny": 0.095047, + "czk": 0.312629, + "dkk": 0.090366, + "eos": 0.0037559, + "eth": 7.147e-05, + "eur": 0.01211961, + "gbp": 0.01107566, + "hkd": 0.105541, + "huf": 3.97, + "idr": 191.75, + "ils": 0.04745883, + "inr": 0.960893, + "jpy": 1.43, + "krw": 16.19, + "kwd": 0.00409361, + "lkr": 2.4, + "ltc": 0.00018598, + "mmk": 20.47, + "mxn": 0.26536, + "myr": 0.056211, + "nok": 0.120606, + "nzd": 0.02100918, + "php": 0.704042, + "pkr": 2.15, + "pln": 0.052749, + "rub": 0.891153, + "sar": 0.050476, + "sek": 0.129909, + "sgd": 0.01861909, + "thb": 0.414071, + "try": 0.076819, + "twd": 0.422042, + "uah": 0.338308, + "usd": 0.01345698, + "vef": 3343.89, + "vnd": 311.66, + "xag": 0.00078867, + "xau": 8.98e-06, + "xdr": 0.00981471, + "xlm": 0.1975895, + "xrp": 0.05067322, + "zar": 0.204922 + }, + "high_24h": { + "aed": 0.053611, + "ars": 0.810805, + "aud": 0.02152674, + "bch": 4.628e-05, + "bdt": 1.23, + "bhd": 0.00550347, + "bmd": 0.0145949, + "bnb": 0.00052215, + "brl": 0.058875, + "btc": 1.37e-06, + "cad": 0.01943935, + "chf": 0.01428979, + "clp": 10.36, + "cny": 0.103044, + "czk": 0.339287, + "dkk": 0.098076, + "eos": 0.00402026, + "eth": 7.423e-05, + "eur": 0.01315448, + "gbp": 0.01201087, + "hkd": 0.114474, + "huf": 4.31, + "idr": 208.11, + "ils": 0.051491, + "inr": 1.04, + "jpy": 1.55, + "krw": 17.63, + "kwd": 0.00443977, + "lkr": 2.6, + "ltc": 0.00019631, + "mmk": 22.24, + "mxn": 0.288202, + "myr": 0.061014, + "nok": 0.131376, + "nzd": 0.02274396, + "php": 0.76332, + "pkr": 2.34, + "pln": 0.057291, + "rub": 0.972261, + "sar": 0.054726, + "sek": 0.14165, + "sgd": 0.02021141, + "thb": 0.449117, + "try": 0.083602, + "twd": 0.457778, + "uah": 0.367456, + "usd": 0.0145949, + "vef": 3626.65, + "vnd": 338.27, + "xag": 0.00085369, + "xau": 9.72e-06, + "xdr": 0.01064365, + "xlm": 0.20827298, + "xrp": 0.05318558, + "zar": 0.223696 + }, + "last_updated": "2019-08-21T08:36:49.371Z", + "low_24h": { + "aed": 0.0491677, + "ars": 0.732555, + "aud": 0.0197477, + "bch": 4.364e-05, + "bdt": 1.13, + "bhd": 0.00504693, + "bmd": 0.01338635, + "bnb": 0.00049273, + "brl": 0.054256, + "btc": 1.3e-06, + "cad": 0.01782004, + "chf": 0.01311131, + "clp": 9.51, + "cny": 0.094517, + "czk": 0.311235, + "dkk": 0.089982, + "eos": 0.00373147, + "eth": 7.098e-05, + "eur": 0.01206786, + "gbp": 0.01103078, + "hkd": 0.104993, + "huf": 3.95, + "idr": 190.79, + "ils": 0.04723279, + "inr": 0.958004, + "jpy": 1.43, + "krw": 16.1, + "kwd": 0.00406945, + "lkr": 2.39, + "ltc": 0.00018228, + "mmk": 20.37, + "mxn": 0.264134, + "myr": 0.055903, + "nok": 0.120189, + "nzd": 0.02091282, + "php": 0.700581, + "pkr": 2.14, + "pln": 0.052569, + "rub": 0.886879, + "sar": 0.050214, + "sek": 0.129578, + "sgd": 0.01853166, + "thb": 0.412199, + "try": 0.076627, + "twd": 0.4198, + "uah": 0.336532, + "usd": 0.01338635, + "vef": 3326.34, + "vnd": 310.32, + "xag": 0.00078625, + "xau": 8.93e-06, + "xdr": 0.0097632, + "xlm": 0.19635382, + "xrp": 0.05037993, + "zar": 0.204544 + }, + "market_cap": { + "aed": 10882251, + "ars": 162133701, + "aud": 4366541, + "bch": 9877, + "bdt": 249997342, + "bhd": 1117236, + "bmd": 2962791, + "bnb": 108994, + "brl": 12008719, + "btc": 290.732, + "cad": 3940802, + "chf": 2899743, + "clp": 2101619696, + "cny": 20926193, + "czk": 68830802, + "dkk": 19895675, + "eos": 826927, + "eth": 15736, + "eur": 2668346, + "gbp": 2438501, + "hkd": 23236814, + "huf": 873552757, + "idr": 42217105275, + "ils": 10448899, + "inr": 211557455, + "jpy": 315583737, + "krw": 3564593111, + "kwd": 901281, + "lkr": 529480380, + "ltc": 40948, + "mmk": 4507718929, + "mxn": 58423768, + "myr": 12375904, + "nok": 26553448, + "nzd": 4625542, + "php": 155007300, + "pkr": 474133000, + "pln": 11613646, + "rub": 196202962, + "sar": 11113192, + "sek": 28601664, + "sgd": 4099321, + "thb": 91165079, + "try": 16912998, + "twd": 92920077, + "uah": 74484427, + "usd": 2962791, + "vef": 736216950688, + "vnd": 68617204931, + "xag": 173639, + "xau": 1976.89, + "xdr": 2160882, + "xlm": 43502811, + "xrp": 11156602, + "zar": 45117091 + }, + "market_cap_change_24h": -160615.84039035, + "market_cap_change_24h_in_currency": { + "aed": -590899.65443375, + "ars": -9124373.5980551, + "aud": -239353.78003874, + "bch": 102.549, + "bdt": -13867874.4362154, + "bhd": -60251.00254582, + "bmd": -160615.84039035, + "bnb": -1507.543569741, + "brl": -718070.38245432, + "btc": 0.03769596, + "cad": -221121.61427417, + "chf": -161095.94704691, + "clp": -127118490.79824165, + "cny": -1134429.68067712, + "czk": -3925858.7665586, + "dkk": -1136450.3780936, + "eos": -24548.1071608166, + "eth": -56.533938946, + "eur": -152193.5816755, + "gbp": -144996.42715597, + "hkd": -1263688.72303977, + "huf": -48860628.81047357, + "idr": -2346101857.217293, + "ils": -576162.08791993, + "inr": -12451722.53525829, + "jpy": -16857632.06248754, + "krw": -209731718.0214291, + "kwd": -49171.67933105, + "lkr": -26048761.01962376, + "ltc": -309.0831858893, + "mmk": -251710124.48363495, + "mxn": -3503488.89323037, + "myr": -687829.52792143, + "nok": -1513569.75537506, + "nzd": -244980.03753899, + "php": -8388263.35503852, + "pkr": -26642819.2931419, + "pln": -696325.10549893, + "rub": -12221976.62125358, + "sar": -601457.67784725, + "sek": -1668070.90346983, + "sgd": -230174.18438848, + "thb": -5107689.97148955, + "try": -927927.24538566, + "twd": -5107834.82635887, + "uah": -4241989.31565817, + "usd": -160615.84039035, + "vef": -39911051485.156494, + "vnd": -4088394297.5983276, + "xag": -9606.58322042, + "xau": -102.32803274, + "xdr": -115659.93877989, + "xlm": -1276957.0373063833, + "xrp": -122973.5124849025, + "zar": -2969034.78716005 + }, + "market_cap_change_percentage_24h": -5.14233, + "market_cap_change_percentage_24h_in_currency": { + "aed": -5.15028, + "ars": -5.32785, + "aud": -5.19668, + "bch": 1.0491, + "bdt": -5.25567, + "bhd": -5.11691, + "bmd": -5.14233, + "bnb": -1.36428, + "brl": -5.6422, + "btc": 0.01297, + "cad": -5.31297, + "chf": -5.26313, + "clp": -5.70361, + "cny": -5.14233, + "czk": -5.39588, + "dkk": -5.4034, + "eos": -2.88301, + "eth": -0.35797, + "eur": -5.3959, + "gbp": -5.61241, + "hkd": -5.15781, + "huf": -5.29704, + "idr": -5.26466, + "ils": -5.22593, + "inr": -5.55858, + "jpy": -5.07086, + "krw": -5.5568, + "kwd": -5.1735, + "lkr": -4.689, + "ltc": -0.74917, + "mmk": -5.28866, + "mxn": -5.65743, + "myr": -5.26518, + "nok": -5.3927, + "nzd": -5.02985, + "php": -5.13372, + "pkr": -5.32031, + "pln": -5.65659, + "rub": -5.86397, + "sar": -5.13424, + "sek": -5.51069, + "sgd": -5.31642, + "thb": -5.30544, + "try": -5.20112, + "twd": -5.21059, + "uah": -5.38827, + "usd": -5.14233, + "vef": -5.14233, + "vnd": -5.62322, + "xag": -5.24248, + "xau": -4.92146, + "xdr": -5.08051, + "xlm": -2.85164, + "xrp": -1.09023, + "zar": -6.17441 + }, + "market_cap_rank": 499, + "price_change_24h": -0.00070501, + "price_change_24h_in_currency": { + "aed": -0.00259384, + "ars": -0.0401764, + "aud": -0.00106049, + "bch": 4.401e-07, + "bdt": -0.06091731, + "bhd": -0.00026442, + "bmd": -0.00070501, + "bnb": -7.9537e-06, + "brl": -0.00316161, + "btc": -7e-10, + "cad": -0.000975, + "chf": -0.00070391, + "clp": -0.55975334, + "cny": -0.00498938, + "czk": -0.01720638, + "dkk": -0.00497873, + "eos": -0.0001041039, + "eth": -1.756e-07, + "eur": -0.00066664, + "gbp": -0.00063744, + "hkd": -0.00554812, + "huf": -0.21652693, + "idr": -10.32117361, + "ils": -0.00254123, + "inr": -0.05433204, + "jpy": -0.07396812, + "krw": -0.92440016, + "kwd": -0.00021588, + "lkr": -0.11324611, + "ltc": -1.1432e-06, + "mmk": -1.10591975, + "mxn": -0.01564173, + "myr": -0.00303114, + "nok": -0.0066618, + "nzd": -0.00108422, + "php": -0.03666507, + "pkr": -0.11708205, + "pln": -0.0030605, + "rub": -0.05396307, + "sar": -0.00263569, + "sek": -0.00737328, + "sgd": -0.00101489, + "thb": -0.02240118, + "try": -0.00415931, + "twd": -0.02243055, + "uah": -0.01864934, + "usd": -0.00070501, + "vef": -175.18566197, + "vnd": -17.91454955, + "xag": -4.268e-05, + "xau": -4.5e-07, + "xdr": -0.00050746, + "xlm": -0.0043814329, + "xrp": -0.0005808077, + "zar": -0.01325238 + }, + "price_change_percentage_14d": -20.09212, + "price_change_percentage_14d_in_currency": { + "aed": -20.09664, + "ars": -3.40252, + "aud": -20.3743, + "bch": -10.35771, + "bdt": -20.21051, + "bhd": -20.07198, + "bmd": -20.09212, + "bnb": -18.90438, + "brl": -18.21564, + "btc": -10.20835, + "cad": -19.99931, + "chf": -19.86474, + "clp": -20.70274, + "cny": -19.67703, + "czk": -19.20224, + "dkk": -19.44946, + "eos": -6.27667, + "eth": -3.85819, + "eur": -19.3615, + "gbp": -19.99287, + "hkd": -20.04155, + "huf": -18.72941, + "idr": -19.92585, + "ils": -19.11955, + "inr": -19.53455, + "jpy": -19.93789, + "krw": -20.72061, + "kwd": -20.08213, + "lkr": -19.39749, + "ltc": 3.01755, + "mmk": -19.52559, + "mxn": -19.64657, + "myr": -20.39088, + "nok": -19.55283, + "nzd": -18.54, + "php": -19.79625, + "pkr": -19.69932, + "pln": -18.70635, + "rub": -18.9447, + "sar": -20.11299, + "sek": -19.43426, + "sgd": -19.93866, + "thb": -19.96922, + "try": -17.50796, + "twd": -20.26871, + "uah": -21.43567, + "usd": -20.09212, + "vef": -20.09212, + "vnd": -20.39781, + "xag": -22.82706, + "xau": -21.25807, + "xdr": -19.80447, + "xlm": -6.90503, + "xrp": -5.82792, + "zar": -18.53383 + }, + "price_change_percentage_1h_in_currency": { + "aed": -0.65082, + "ars": -0.65814, + "aud": -0.81241, + "bch": 1.34916, + "bdt": -0.64945, + "bhd": -0.62736, + "bmd": -0.65082, + "bnb": -0.66128, + "brl": -0.65109, + "btc": -0.64949, + "cad": -0.75327, + "chf": -0.6566, + "clp": -0.81121, + "cny": -0.61001, + "czk": -0.71198, + "dkk": -0.72865, + "eos": -0.27623, + "eth": -0.72711, + "eur": -0.73062, + "gbp": -0.79594, + "hkd": -0.65424, + "huf": -0.65304, + "idr": -0.69877, + "ils": -0.68895, + "inr": -0.85681, + "jpy": -0.70261, + "krw": -0.64504, + "kwd": -0.68347, + "lkr": -0.66193, + "ltc": 0.20669, + "mmk": -0.65082, + "mxn": -0.79588, + "myr": -0.58632, + "nok": -0.94166, + "nzd": -0.77361, + "php": -0.65651, + "pkr": -0.65082, + "pln": -0.82133, + "rub": -0.80523, + "sar": -0.62904, + "sek": -0.92466, + "sgd": -0.72845, + "thb": -0.71559, + "try": -0.93842, + "twd": -0.63818, + "uah": -0.65082, + "usd": -0.65082, + "vef": -0.65082, + "vnd": -0.72098, + "xag": -0.86625, + "xau": -0.66422, + "xdr": -0.65082, + "xlm": -0.6397, + "xrp": -0.05073, + "zar": -1.25864 + }, + "price_change_percentage_1y": -80.39683, + "price_change_percentage_1y_in_currency": { + "aed": -80.39794, + "ars": -61.05676, + "aud": -78.80429, + "bch": -66.67604, + "bdt": -80.26581, + "bhd": -80.39891, + "bmd": -80.39683, + "brl": -79.97401, + "btc": -87.93415, + "cad": -80.00734, + "chf": -80.63119, + "clp": -79.21186, + "cny": -79.80673, + "czk": -79.67769, + "dkk": -79.72199, + "eth": -71.77736, + "eur": -79.71573, + "gbp": -79.34655, + "hkd": -80.41399, + "huf": -79.49619, + "idr": -80.5156, + "ils": -81.08059, + "inr": -79.93604, + "jpy": -81.01454, + "krw": -78.90452, + "kwd": -80.34132, + "lkr": -78.15787, + "ltc": -85.4361, + "mmk": -80.27721, + "mxn": -79.65762, + "myr": -80.02222, + "nok": -79.18424, + "nzd": -79.67365, + "php": -80.76747, + "pkr": -74.51734, + "pln": -79.50758, + "rub": -80.62327, + "sar": -80.39647, + "sek": -79.31728, + "sgd": -80.18923, + "thb": -81.67711, + "try": -81.65737, + "twd": -79.98887, + "uah": -82.20648, + "usd": -80.39683, + "vef": -80.39558, + "vnd": -80.34916, + "xag": -83.03235, + "xau": -84.4215, + "xdr": -80.03907, + "zar": -79.43625 + }, + "price_change_percentage_200d": -50.1114, + "price_change_percentage_200d_in_currency": { + "aed": -50.11196, + "ars": -26.51722, + "aud": -46.67198, + "bch": -80.79243, + "bdt": -49.71149, + "bhd": -50.09578, + "bmd": -50.1114, + "bnb": -87.93302, + "brl": -44.75887, + "btc": -83.02991, + "cad": -49.34427, + "chf": -50.94689, + "clp": -45.88183, + "cny": -47.75857, + "czk": -48.37087, + "dkk": -48.59098, + "eos": -67.57399, + "eth": -71.6239, + "eur": -48.52075, + "gbp": -46.27358, + "hkd": -50.136, + "huf": -46.91923, + "idr": -49.00487, + "ils": -51.63145, + "inr": -50.15368, + "jpy": -51.46878, + "krw": -46.36111, + "kwd": -49.91845, + "lkr": -49.53248, + "ltc": -77.44522, + "mmk": -49.82943, + "mxn": -48.49618, + "myr": -49.12989, + "nok": -47.01887, + "nzd": -46.2816, + "php": -50.10377, + "pkr": -42.33563, + "pln": -47.7461, + "rub": -49.52654, + "sar": -50.10515, + "sek": -46.7992, + "sgd": -48.88484, + "thb": -50.95616, + "try": -45.32063, + "twd": -49.1634, + "uah": -54.76622, + "usd": -50.1114, + "vef": -50.1114, + "vnd": -50.2089, + "xag": -53.50147, + "xau": -56.13406, + "xdr": -49.07152, + "xlm": -39.53366, + "xrp": -42.37148, + "zar": -42.98063 + }, + "price_change_percentage_24h": -4.97817, + "price_change_percentage_24h_in_currency": { + "aed": -4.98614, + "ars": -5.17346, + "aud": -5.07575, + "bch": 0.99066, + "bdt": -5.0917, + "bhd": -4.95271, + "bmd": -4.97817, + "bnb": -1.58124, + "brl": -5.4789, + "btc": -0.05257, + "cad": -5.16583, + "chf": -5.07341, + "clp": -5.53921, + "cny": -4.98758, + "czk": -5.21666, + "dkk": -5.22182, + "eos": -2.69699, + "eth": -0.24506, + "eur": -5.21371, + "gbp": -5.44209, + "hkd": -4.99428, + "huf": -5.17487, + "idr": -5.1077, + "ils": -5.08246, + "inr": -5.35173, + "jpy": -4.90717, + "krw": -5.40119, + "kwd": -5.00939, + "lkr": -4.49721, + "ltc": -0.61091, + "mmk": -5.12476, + "mxn": -5.56641, + "myr": -5.1165, + "nok": -5.23449, + "nzd": -4.90745, + "php": -4.95001, + "pkr": -5.15646, + "pln": -5.48383, + "rub": -5.70968, + "sar": -4.96254, + "sek": -5.3709, + "sgd": -5.16905, + "thb": -5.13232, + "try": -5.13634, + "twd": -5.04655, + "uah": -5.22453, + "usd": -4.97817, + "vef": -4.97817, + "vnd": -5.43568, + "xag": -5.1341, + "xau": -4.8084, + "xdr": -4.91624, + "xlm": -2.16934, + "xrp": -1.13319, + "zar": -6.07423 + }, + "price_change_percentage_30d": -34.83569, + "price_change_percentage_30d_in_currency": { + "aed": -34.83544, + "ars": -15.98426, + "aud": -32.35353, + "bch": -30.11906, + "bdt": -34.93771, + "bhd": -34.7457, + "bmd": -34.83569, + "bnb": -27.08407, + "brl": -29.51868, + "btc": -32.08124, + "cad": -33.60701, + "chf": -35.09987, + "clp": -32.84418, + "cny": -33.12269, + "czk": -33.51308, + "dkk": -34.24389, + "eos": -21.08346, + "eth": -21.69788, + "eur": -34.16271, + "gbp": -32.89529, + "hkd": -34.53494, + "huf": -33.76133, + "idr": -33.48833, + "ils": -35.07099, + "inr": -32.4077, + "jpy": -35.60577, + "krw": -33.33925, + "kwd": -34.83162, + "lkr": -33.78522, + "ltc": -10.07379, + "mmk": -34.67478, + "mxn": -32.46726, + "myr": -33.79734, + "nok": -31.87864, + "nzd": -31.23716, + "php": -33.28065, + "pkr": -34.80085, + "pln": -32.59928, + "rub": -31.5309, + "sar": -34.83447, + "sek": -32.96828, + "sgd": -33.73135, + "thb": -35.04678, + "try": -34.23351, + "twd": -34.17354, + "uah": -36.37221, + "usd": -34.83569, + "vef": -34.83569, + "vnd": -35.19581, + "xag": -38.03606, + "xau": -38.0235, + "xdr": -34.25025, + "xlm": -12.74201, + "xrp": -18.8697, + "zar": -28.75132 + }, + "price_change_percentage_60d": -61.24989, + "price_change_percentage_60d_in_currency": { + "aed": -61.25202, + "ars": -50.32249, + "aud": -60.412, + "bch": -43.0945, + "bdt": -61.20391, + "bhd": -61.23344, + "bmd": -61.24989, + "bnb": -44.49169, + "brl": -58.90604, + "btc": -61.42639, + "cad": -61.04496, + "chf": -61.10703, + "clp": -59.79652, + "cny": -60.16104, + "czk": -60.03065, + "dkk": -60.38034, + "eos": -23.51938, + "eth": -39.23291, + "eur": -60.26215, + "gbp": -59.36192, + "hkd": -61.10542, + "huf": -59.91464, + "idr": -60.90777, + "ils": -62.26651, + "inr": -60.23354, + "jpy": -61.53855, + "krw": -59.78067, + "kwd": -61.16844, + "lkr": -60.71768, + "ltc": -25.65935, + "mmk": -61.20413, + "mxn": -60.04539, + "myr": -60.87356, + "nok": -59.13075, + "nzd": -60.12056, + "php": -60.49041, + "pkr": -60.53743, + "pln": -59.42569, + "rub": -59.28727, + "sar": -61.24451, + "sek": -59.99926, + "sgd": -60.43237, + "thb": -61.1805, + "try": -62.00162, + "twd": -60.74424, + "uah": -62.83383, + "usd": -61.24989, + "vef": -61.24989, + "vnd": -61.16958, + "xag": -65.19693, + "xau": -63.82007, + "xdr": -60.62729, + "xlm": -29.85582, + "xrp": -35.11899, + "zar": -58.83133 + }, + "price_change_percentage_7d": -12.91815, + "price_change_percentage_7d_in_currency": { + "aed": -12.92308, + "ars": -14.25115, + "aud": -12.76443, + "bch": 0.88592, + "bdt": -13.147, + "bhd": -12.88673, + "bmd": -12.91815, + "bnb": -5.78627, + "brl": -10.95714, + "btc": -6.92663, + "cad": -12.35787, + "chf": -12.68629, + "clp": -12.25865, + "cny": -12.67706, + "czk": -12.47009, + "dkk": -12.42719, + "eos": -0.91188, + "eth": -3.2526, + "eur": -12.3442, + "gbp": -13.56715, + "hkd": -12.94473, + "huf": -11.29007, + "idr": -13.63998, + "ils": -11.80257, + "inr": -12.53093, + "jpy": -12.98836, + "krw": -13.1693, + "kwd": -12.90068, + "lkr": -11.99684, + "ltc": 1.8824, + "mmk": -12.2934, + "mxn": -11.39186, + "myr": -13.13461, + "nok": -11.99025, + "nzd": -12.14546, + "php": -12.50757, + "pkr": -13.04362, + "pln": -11.96443, + "rub": -11.16958, + "sar": -12.91768, + "sek": -11.88369, + "sgd": -12.90808, + "thb": -12.98884, + "try": -10.77039, + "twd": -12.26523, + "uah": -12.97908, + "usd": -12.91815, + "vef": -12.91815, + "vnd": -13.40154, + "xag": -13.34686, + "xau": -12.77828, + "xdr": -12.6042, + "xlm": -3.71389, + "xrp": -2.40223, + "zar": -12.40714 + }, + "roi": null, + "total_supply": 252193195.0, + "total_volume": { + "aed": 440559, + "ars": 6563849, + "aud": 176776, + "bch": 399.879, + "bdt": 10120936, + "bhd": 45230, + "bmd": 119946, + "bnb": 4413, + "brl": 486163, + "btc": 11.770053, + "cad": 159540, + "chf": 117394, + "clp": 85082341, + "cny": 847180, + "czk": 2786558, + "dkk": 805460, + "eos": 33477, + "eth": 637.075, + "eur": 108026, + "gbp": 98721, + "hkd": 940723, + "huf": 35365063, + "idr": 1709124708, + "ils": 423015, + "inr": 8564729, + "jpy": 12776147, + "krw": 144309614, + "kwd": 36488, + "lkr": 21435577, + "ltc": 1658, + "mmk": 182491285, + "mxn": 2365238, + "myr": 501028, + "nok": 1074994, + "nzd": 187261, + "php": 6275343, + "pkr": 19194884, + "pln": 470169, + "rub": 7943115, + "sar": 449908, + "sek": 1157915, + "sgd": 165958, + "thb": 3690743, + "try": 684709, + "twd": 3761793, + "uah": 3015441, + "usd": 119946, + "vef": 29805136391, + "vnd": 2777910981, + "xag": 7029.61, + "xau": 80.03, + "xdr": 87482, + "xlm": 1761175, + "xrp": 451666, + "zar": 1826528 + } + }, + "name": "POA Network", + "public_interest_score": 27.778, + "public_interest_stats": { + "alexa_rank": 702581, + "bing_matches": 107000 + }, + "sentiment_votes_down_percentage": null, + "sentiment_votes_up_percentage": null, + "status_updates": [], + "symbol": "poa", + "tickers": [ + { + "base": "POA", + "bid_ask_spread_percentage": 1.503759, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.32e-06, + "eth": 7.139e-05, + "usd": 0.01344331 + }, + "converted_volume": { + "btc": 10.856044, + "eth": 587.121, + "usd": 110562 + }, + "is_anomaly": false, + "is_stale": false, + "last": 1.32e-06, + "last_fetch_at": "2019-08-21T08:34:21+00:00", + "last_traded_at": "2019-08-21T08:34:21+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "binance", + "name": "Binance" + }, + "target": "BTC", + "timestamp": "2019-08-21T08:34:21+00:00", + "trade_url": "https://www.binance.com/trade.html?symbol=POA_BTC", + "trust_score": "green", + "volume": 8224275.5227272725 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 1.729386, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.34e-06, + "eth": 7.226e-05, + "usd": 0.01360764 + }, + "converted_volume": { + "btc": 0.35219856, + "eth": 19.04774, + "usd": 3586.91 + }, + "is_anomaly": false, + "is_stale": false, + "last": 7.238e-05, + "last_fetch_at": "2019-08-21T08:34:26+00:00", + "last_traded_at": "2019-08-21T08:34:26+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "binance", + "name": "Binance" + }, + "target": "ETH", + "timestamp": "2019-08-21T08:34:26+00:00", + "trade_url": "https://www.binance.com/trade.html?symbol=POA_ETH", + "trust_score": "green", + "volume": 263595.07819839736 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 1.39165, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.34e-06, + "eth": 7.259e-05, + "usd": 0.01363846 + }, + "converted_volume": { + "btc": 0.24038472, + "eth": 13.008637, + "usd": 2444.17 + }, + "is_anomaly": false, + "is_stale": false, + "last": 0.000502, + "last_fetch_at": "2019-08-21T08:34:26+00:00", + "last_traded_at": "2019-08-21T08:13:08+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "binance", + "name": "Binance" + }, + "target": "BNB", + "timestamp": "2019-08-21T08:13:08+00:00", + "trade_url": "https://www.binance.com/trade.html?symbol=POA_BNB", + "trust_score": "green", + "volume": 179211.83864541832 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 2.985075, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.3e-06, + "eth": 7.036e-05, + "usd": 0.01324803 + }, + "converted_volume": { + "btc": 0.1595777, + "eth": 8.637423, + "usd": 1626.22 + }, + "is_anomaly": false, + "is_stale": false, + "last": 1.3e-06, + "last_fetch_at": "2019-08-21T08:36:07+00:00", + "last_traded_at": "2019-08-21T08:36:07+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "bibox", + "name": "Bibox" + }, + "target": "BTC", + "timestamp": "2019-08-21T08:36:07+00:00", + "trade_url": "https://www.bibox.com/exchange?coinPair=POA_BTC", + "trust_score": "yellow", + "volume": 122752.0737 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 3.247202, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.31e-06, + "eth": 7.077e-05, + "usd": 0.01332498 + }, + "converted_volume": { + "btc": 0.1127777, + "eth": 6.104291, + "usd": 1149.29 + }, + "is_anomaly": false, + "is_stale": false, + "last": 7.087e-05, + "last_fetch_at": "2019-08-21T08:35:50+00:00", + "last_traded_at": "2019-08-21T08:35:50+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "bibox", + "name": "Bibox" + }, + "target": "ETH", + "timestamp": "2019-08-21T08:35:50+00:00", + "trade_url": "https://www.bibox.com/exchange?coinPair=POA_ETH", + "trust_score": "yellow", + "volume": 86251.0552 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": 13.032676, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.16e-06, + "eth": 6.257e-05, + "usd": 0.01177973 + }, + "converted_volume": { + "btc": 0.00087672, + "eth": 0.04748752, + "usd": 8.94 + }, + "is_anomaly": false, + "is_stale": false, + "last": 1.1551e-06, + "last_fetch_at": "2019-08-21T08:37:38+00:00", + "last_traded_at": "2019-08-21T07:08:25+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "BTC", + "timestamp": "2019-08-21T07:08:25+00:00", + "trade_url": "https://hitbtc.com/POA20-to-BTC", + "trust_score": "red", + "volume": 759.0 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": 33.072445, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.57e-06, + "eth": 8.48e-05, + "usd": 0.01595278 + }, + "converted_volume": { + "btc": 0.00021915, + "eth": 0.0118714, + "usd": 2.23 + }, + "is_anomaly": false, + "is_stale": false, + "last": 8.4891e-05, + "last_fetch_at": "2019-08-21T08:37:21+00:00", + "last_traded_at": "2019-08-21T07:37:25+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "ETH", + "timestamp": "2019-08-21T07:37:25+00:00", + "trade_url": "https://hitbtc.com/POA20-to-ETH", + "trust_score": "red", + "volume": 140.0 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": 53.1004, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.15e-06, + "eth": 6.232e-05, + "usd": 0.0117249 + }, + "converted_volume": { + "btc": 7.478e-05, + "eth": 0.00405098, + "usd": 0.762119 + }, + "is_anomaly": false, + "is_stale": false, + "last": 0.0117249, + "last_fetch_at": "2019-08-21T08:37:46+00:00", + "last_traded_at": "2019-08-21T07:37:33+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "USD", + "timestamp": "2019-08-21T07:37:33+00:00", + "trade_url": "https://hitbtc.com/POA20-to-USD", + "trust_score": null, + "volume": 65.0 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": null, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.32e-06, + "eth": 7.134e-05, + "usd": 0.01339322 + }, + "converted_volume": { + "btc": 0.03831341, + "eth": 2.073192, + "usd": 389.22 + }, + "is_anomaly": false, + "is_stale": false, + "last": 0.034733328618915156, + "last_fetch_at": "2019-08-21T08:21:59+00:00", + "last_traded_at": "2019-08-21T08:21:59+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "bancor", + "name": "Bancor Network" + }, + "target": "BNT", + "timestamp": "2019-08-21T08:21:59+00:00", + "trade_url": null, + "trust_score": null, + "volume": 29061.03634563883 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": null, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.31e-06, + "eth": 7.074e-05, + "usd": 0.0132809 + }, + "converted_volume": { + "btc": 0.009587, + "eth": 0.51876605, + "usd": 97.39 + }, + "is_anomaly": false, + "is_stale": false, + "last": 7.0704231362995e-05, + "last_fetch_at": "2019-08-21T08:26:12+00:00", + "last_traded_at": "2019-08-21T08:21:13+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "uniswap", + "name": "Uniswap" + }, + "target": "ETH", + "timestamp": "2019-08-21T08:21:13+00:00", + "trade_url": null, + "trust_score": null, + "volume": 7333.316809051611 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 40.083051, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.33e-06, + "eth": 7.005e-05, + "usd": 0.01377146 + }, + "converted_volume": { + "btc": 0.0022752, + "eth": 0.12002061, + "usd": 23.59 + }, + "is_anomaly": false, + "is_stale": true, + "last": 7.004e-05, + "last_fetch_at": "2019-08-21T08:32:14+00:00", + "last_traded_at": "2019-08-18T18:43:13+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "ethfinex", + "name": "Ethfinex" + }, + "target": "ETH", + "timestamp": "2019-08-18T18:43:13+00:00", + "trade_url": "https://ethfinex.com", + "trust_score": "red", + "volume": 1713.3067 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 44.440399, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.33e-06, + "eth": 7.311e-05, + "usd": 0.013499 + }, + "converted_volume": { + "btc": 0.00442255, + "eth": 0.24305992, + "usd": 44.88 + }, + "is_anomaly": false, + "is_stale": true, + "last": 0.013499, + "last_fetch_at": "2019-08-21T08:32:13+00:00", + "last_traded_at": "2019-08-14T17:19:27+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "ethfinex", + "name": "Ethfinex" + }, + "target": "USD", + "timestamp": "2019-08-14T17:19:27+00:00", + "trade_url": "https://ethfinex.com", + "trust_score": "red", + "volume": 3324.44883078 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 14.012015, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.36e-06, + "eth": 7.49e-05, + "usd": 0.01446844 + }, + "converted_volume": { + "btc": 5.45e-06, + "eth": 0.00029958, + "usd": 0.057874 + }, + "is_anomaly": false, + "is_stale": true, + "last": 7.4743e-05, + "last_fetch_at": "2019-08-21T08:37:09+00:00", + "last_traded_at": "2019-08-21T02:52:09+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "ETH", + "timestamp": "2019-08-21T02:52:09+00:00", + "trade_url": "https://hitbtc.com/POA-to-ETH", + "trust_score": null, + "volume": 4.0 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 64.645979, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.36e-06, + "eth": 7.473e-05, + "usd": 0.01443604 + }, + "converted_volume": { + "btc": 2.72e-06, + "eth": 0.00014946, + "usd": 0.02887207 + }, + "is_anomaly": false, + "is_stale": true, + "last": 0.0143016, + "last_fetch_at": "2019-08-21T08:37:44+00:00", + "last_traded_at": "2019-08-21T02:52:25+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "DAI", + "timestamp": "2019-08-21T02:52:25+00:00", + "trade_url": "https://hitbtc.com/POA-to-DAI", + "trust_score": null, + "volume": 2.0 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 64.353312, + "coin_id": "poa-network", + "converted_last": { + "btc": 2.23e-06, + "eth": 0.00012505, + "usd": 0.02310309 + }, + "converted_volume": { + "btc": 0.00275182, + "eth": 0.15430951, + "usd": 28.51 + }, + "is_anomaly": true, + "is_stale": true, + "last": 2.23e-06, + "last_fetch_at": "2019-08-21T08:32:12+00:00", + "last_traded_at": "2019-08-17T12:50:06+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "ethfinex", + "name": "Ethfinex" + }, + "target": "BTC", + "timestamp": "2019-08-17T12:50:06+00:00", + "trade_url": "https://ethfinex.com", + "trust_score": "red", + "volume": 1234.0 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 21.080977, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.23e-06, + "eth": 6.72e-05, + "usd": 0.01322824 + }, + "converted_volume": { + "btc": 0.0, + "eth": 0.0, + "usd": 0.0 + }, + "is_anomaly": true, + "is_stale": true, + "last": 1.2331e-06, + "last_fetch_at": "2019-08-21T08:37:17+00:00", + "last_traded_at": "2019-08-20T18:50:31+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "BTC", + "timestamp": "2019-08-20T18:50:31+00:00", + "trade_url": "https://hitbtc.com/POA-to-BTC", + "trust_score": null, + "volume": 0.0 + }, + { + "base": "POA", + "bid_ask_spread_percentage": 36.441715, + "coin_id": "poa-network", + "converted_last": { + "btc": 1.22e-06, + "eth": 6.66e-05, + "usd": 0.0131106 + }, + "converted_volume": { + "btc": 0.0, + "eth": 0.0, + "usd": 0.0 + }, + "is_anomaly": true, + "is_stale": true, + "last": 0.0131106, + "last_fetch_at": "2019-08-21T08:37:14+00:00", + "last_traded_at": "2019-08-20T18:50:15+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "USD", + "timestamp": "2019-08-20T18:50:15+00:00", + "trade_url": "https://hitbtc.com/POA-to-USD", + "trust_score": null, + "volume": 0.0 + }, + { + "base": "POA20", + "bid_ask_spread_percentage": 70.656026, + "coin_id": "poa-network", + "converted_last": { + "btc": 7.522e-07, + "eth": 4.006e-05, + "usd": 0.0080416 + }, + "converted_volume": { + "btc": 0.0, + "eth": 0.0, + "usd": 0.0 + }, + "is_anomaly": true, + "is_stale": true, + "last": 0.008, + "last_fetch_at": "2019-08-21T08:37:29+00:00", + "last_traded_at": "2019-08-19T09:09:06+00:00", + "market": { + "has_trading_incentive": false, + "identifier": "hitbtc", + "name": "HitBTC" + }, + "target": "DAI", + "timestamp": "2019-08-19T09:09:06+00:00", + "trade_url": "https://hitbtc.com/POA20-to-DAI", + "trust_score": null, + "volume": 0.0 + } + ] +} From 6b2f2717fe1b494c70e71968c9c0296598d00595 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:21 +0000 Subject: [PATCH 229/290] Bump tar from 2.2.1 to 2.2.2 in /apps/block_scout_web/assets Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/npm/node-tar/releases) - [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 129 +++++++++++++----- 1 file changed, 95 insertions(+), 34 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index a03732e4e0..8f53f370d1 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4293,6 +4293,16 @@ "readable-stream": "^2.0.0" } }, + "fs-minipass": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", + "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", @@ -4375,9 +4385,7 @@ "chownr": { "version": "1.0.1", "resolved": false, - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true, - "optional": true + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "code-point-at": { "version": "1.1.0", @@ -4442,8 +4450,6 @@ "version": "1.2.5", "resolved": false, "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "dev": true, - "optional": true, "requires": { "minipass": "^2.2.1" } @@ -4577,7 +4583,6 @@ "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "dev": true, "optional": true, "requires": { "safe-buffer": "^5.1.1", @@ -4588,8 +4593,6 @@ "version": "1.1.0", "resolved": false, "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", - "dev": true, - "optional": true, "requires": { "minipass": "^2.2.1" } @@ -4799,7 +4802,6 @@ "version": "5.1.1", "resolved": false, "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, "optional": true }, "safer-buffer": { @@ -4876,22 +4878,6 @@ "dev": true, "optional": true }, - "tar": { - "version": "4.4.1", - "resolved": false, - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": false, @@ -4920,7 +4906,6 @@ "version": "3.0.2", "resolved": false, "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true, "optional": true } } @@ -6024,7 +6009,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -6226,7 +6211,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, @@ -7422,6 +7407,36 @@ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true, + "optional": true + } + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.2.1" + } + }, "mississippi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", @@ -7608,6 +7623,31 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true + }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, + "requires": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + }, + "dependencies": { + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + } + } + } } } }, @@ -10720,14 +10760,35 @@ "dev": true }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", + "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", "dev": true, + "optional": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.5", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + }, + "dependencies": { + "chownr": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", + "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==", + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true, + "optional": true + } } }, "terser": { From a849118d70b21acc757e19b0cec7e7cc63e532f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:21 +0000 Subject: [PATCH 230/290] Bump fstream from 1.0.11 to 1.0.12 in /apps/block_scout_web/assets Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. - [Release notes](https://github.com/npm/fstream/releases) - [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 8f53f370d1..1359939cdc 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4911,9 +4911,9 @@ } }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", From 918b22ae49b5094832b511275cb461f71cb33269 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:21 +0000 Subject: [PATCH 231/290] Bump lodash.mergewith in /apps/block_scout_web/assets Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 1359939cdc..88ba9eedbc 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -7002,9 +7002,9 @@ "dev": true }, "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", "dev": true }, "lodash.sortby": { From 5d1254c567ed90ce518b729ed97f9e173093f21a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:20 +0000 Subject: [PATCH 232/290] Bump js-yaml from 3.7.0 to 3.13.1 in /apps/block_scout_web/assets Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.7.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.7.0...3.13.1) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 61 +++++-------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 88ba9eedbc..c396e33c4b 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -2678,8 +2678,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "is-svg": { "version": "3.0.0", @@ -2690,16 +2689,6 @@ "html-comment-regex": "^1.1.0" } }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "mdn-data": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz", @@ -3638,8 +3627,7 @@ "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" }, "globals": { "version": "11.7.0", @@ -3647,16 +3635,6 @@ "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", "dev": true }, - "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -3812,12 +3790,6 @@ "acorn-jsx": "^3.0.0" } }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, "esquery": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", @@ -6759,13 +6731,21 @@ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", - "esprima": "^2.6.0" + "esprima": "^4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + } } }, "jsbn": { @@ -8066,18 +8046,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "parse-json": { "version": "4.0.0", From 57487470cd146674048edb1d96e4ab0ecfac7d0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:16 +0000 Subject: [PATCH 233/290] Bump extend from 3.0.1 to 3.0.2 in /apps/block_scout_web/assets Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/justmoon/node-extend/releases) - [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md) - [Commits](https://github.com/justmoon/node-extend/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index c396e33c4b..bcf7afd17b 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -3952,9 +3952,9 @@ } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, "extend-shallow": { From 57d234558e702d88fa3f7ecf3cdd9029a04b5536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:15 +0000 Subject: [PATCH 234/290] Bump handlebars from 4.0.12 to 4.1.2 in /apps/block_scout_web/assets Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.12 to 4.1.2. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.1.2) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index bcf7afd17b..11ef37482c 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -5115,15 +5115,23 @@ "dev": true }, "handlebars": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz", - "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", + "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", "dev": true, "requires": { - "async": "^2.5.0", + "neo-async": "^2.6.0", "optimist": "^0.6.1", "source-map": "^0.6.1", "uglify-js": "^3.1.4" + }, + "dependencies": { + "neo-async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "dev": true + } } }, "har-schema": { From c26ec1c19072cce8614157117359a0e9dc468d84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:33:15 +0000 Subject: [PATCH 235/290] Bump lodash from 4.17.11 to 4.17.13 in /apps/block_scout_web/assets Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- apps/block_scout_web/assets/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 11ef37482c..2c78f45f55 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -6961,9 +6961,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.13", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz", + "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==" }, "lodash.assign": { "version": "4.2.0", diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index 5c92b7b1f9..98fbc501d6 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -30,7 +30,7 @@ "highlightjs-solidity": "^1.0.6", "humps": "^2.0.1", "jquery": "^3.3.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "moment": "^2.22.1", "nanomorph": "^5.1.3", "numeral": "^2.0.6", From e3fac4f2b190c63010381322954c264df280089e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 21 Aug 2019 15:32:04 +0300 Subject: [PATCH 236/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8b6d16ed3..a90e6e26b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities - [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically - [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases - [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error From 48a01e98a599ad34c892fa01fb031059ef2fbcfe Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 22 Aug 2019 11:22:54 +0300 Subject: [PATCH 237/290] fix json decoding --- apps/explorer/lib/explorer/exchange_rates/source.ex | 7 ++++++- .../lib/explorer/exchange_rates/source/coin_gecko.ex | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex index d733b22222..6d95e48796 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source.ex @@ -39,7 +39,12 @@ defmodule Explorer.ExchangeRates.Source do defp fetch_exchange_rates_request(source) do case HTTPoison.get(source.source_url(), headers()) do {:ok, %Response{body: body, status_code: 200}} -> - {:ok, source.format_data(body)} + result = + body + |> decode_json() + |> source.format_data() + + {:ok, result} {:ok, %Response{body: body, status_code: status_code}} when status_code in 400..499 -> {:error, decode_json(body)["error"]} diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex index 5b0bed2b3b..95ecafb046 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/coin_gecko.ex @@ -11,12 +11,10 @@ defmodule Explorer.ExchangeRates.Source.CoinGecko do @behaviour Source @impl Source - def format_data(%{"market_data" => _} = data) do + def format_data(%{"market_data" => _} = json_data) do {:ok, price} = get_btc_price() btc_price = to_decimal(price) - json_data = decode_json(data) - market_data = json_data["market_data"] {:ok, last_updated, 0} = DateTime.from_iso8601(market_data["last_updated"]) From 48e9005f5b1553bbd495e21e4d6129b44b43c37c Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 22 Aug 2019 13:36:55 +0300 Subject: [PATCH 238/290] remove reward from getminedblocks rpc response Reward calculation is a heavy operation since it joins `rewards` and `transactions` tables with `blocks`. `transactions` is one of the largest tables in the DB. So that was a reason for a request timeout. Removing rewards fixed the issue. From this point rewards should be fetched with `getblockreward` rpc. --- .../block_scout_web/views/api/rpc/address_view.ex | 3 +-- apps/explorer/lib/explorer/etherscan.ex | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex index 2ec350da71..8063b1db40 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex @@ -157,8 +157,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do defp prepare_block(block) do %{ "blockNumber" => to_string(block.number), - "timeStamp" => to_string(block.timestamp), - "blockReward" => to_string(block.reward.value) + "timeStamp" => to_string(block.timestamp) } end diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index ca31cc5c3c..848f5ae620 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -8,8 +8,7 @@ defmodule Explorer.Etherscan do alias Explorer.Etherscan.Logs alias Explorer.{Chain, Repo} alias Explorer.Chain.Address.TokenBalance - alias Explorer.Chain.{Block, Hash, InternalTransaction, Transaction, Wei} - alias Explorer.Chain.Block.EmissionReward + alias Explorer.Chain.{Block, Hash, InternalTransaction, Transaction} @default_options %{ order_by_direction: :asc, @@ -187,22 +186,15 @@ defmodule Explorer.Etherscan do query = from( b in Block, - left_join: t in assoc(b, :transactions), - inner_join: r in EmissionReward, - on: fragment("? <@ ?", b.number, r.block_range), where: b.miner_hash == ^address_hash, order_by: [desc: b.number], group_by: b.number, group_by: b.timestamp, - group_by: r.reward, limit: ^merged_options.page_size, offset: ^offset(merged_options), select: %{ number: b.number, - timestamp: b.timestamp, - reward: %Wei{ - value: fragment("coalesce(sum(? * ?), 0) + ?", t.gas_used, t.gas_price, r.reward) - } + timestamp: b.timestamp } ) From b5999c45fe026ad897ac9527f4f60d4da2cf0ee9 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 22 Aug 2019 13:54:19 +0300 Subject: [PATCH 239/290] update docs --- apps/block_scout_web/lib/block_scout_web/etherscan.ex | 5 ----- 1 file changed, 5 deletions(-) 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 867b56e746..021a0b3aa1 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -713,11 +713,6 @@ defmodule BlockScoutWeb.Etherscan do type: "timestamp", definition: "When the block was collated.", example: ~s("1480072029") - }, - blockReward: %{ - type: "block reward", - definition: "The reward given to the miner of a block.", - example: ~s("5003251945421042780") } } } From 8b91527965aa5aaeb5cfa8fdb0d3ca9609744cf5 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 22 Aug 2019 13:55:47 +0300 Subject: [PATCH 240/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 683dbac49f..08c0f4bd21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint - [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload From c5e4485d3d658b5fc53c2e254e93338ae4348c13 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 12:54:27 +0300 Subject: [PATCH 241/290] deduplicate coin history records by delta On coin history page we show records that are found in the db. Since we may fetch a lot of duplicated balances for the same address if its balance is not changes for multiple blocks. This PR adds deduplication by delta value to remove duplication. --- apps/explorer/lib/explorer/chain.ex | 3 +++ apps/explorer/test/explorer/chain_test.exs | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 58253c0f27..a6200a81f9 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2967,6 +2967,9 @@ defmodule Explorer.Chain do |> CoinBalance.fetch_coin_balances(paging_options) |> page_coin_balances(paging_options) |> Repo.all() + |> Enum.dedup_by(fn record -> + record.delta == Decimal.new(0) + end) end def get_coin_balance(address_hash, block_number) do diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index f49be6da4e..10788b60ba 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -4159,4 +4159,30 @@ defmodule Explorer.ChainTest do assert Chain.staking_pools_count(:inactive) == 1 end end + + describe "address_to_coin_balances/2" do + test "deduplicates records by zero delta" do + address = insert(:address) + + 1..5 + |> Enum.each(fn block_number -> + insert(:block, number: block_number) + insert(:fetched_balance, value: 1, block_number: block_number, address_hash: address.hash) + end) + + insert(:block, number: 6) + insert(:fetched_balance, value: 2, block_number: 6, address_hash: address.hash) + + assert [first, second, third] = Chain.address_to_coin_balances(address.hash, []) + + assert first.block_number == 6 + assert first.delta == Decimal.new(1) + + assert second.block_number == 5 + assert second.delta == Decimal.new(0) + + assert third.block_number == 1 + assert third.delta == Decimal.new(1) + end + end end From e8ba3b22785931c890ebc856096b99482c99a399 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 12:59:07 +0300 Subject: [PATCH 242/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c26c016be..d6cfce7118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta - [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload From 045652a505a93120d28a1db92fc20241a6a8dd40 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 14:00:16 +0300 Subject: [PATCH 243/290] fix tests --- apps/explorer/lib/explorer/chain.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index a6200a81f9..c781a3463e 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2968,7 +2968,11 @@ defmodule Explorer.Chain do |> page_coin_balances(paging_options) |> Repo.all() |> Enum.dedup_by(fn record -> - record.delta == Decimal.new(0) + if record.delta == Decimal.new(0) do + :dup + else + System.unique_integer + end end) end From cd979c02c2f257fa06eb79d05684cd14333e6406 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 14:02:46 +0300 Subject: [PATCH 244/290] mix format --- apps/explorer/lib/explorer/chain.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index c781a3463e..b2c18e8a50 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2971,7 +2971,7 @@ defmodule Explorer.Chain do if record.delta == Decimal.new(0) do :dup else - System.unique_integer + System.unique_integer() end end) end From 0e736637a7a12484752ff65653227688d1d5518f Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 15:31:02 +0300 Subject: [PATCH 245/290] skip cache update if there are no blocks inserted Sometimes due to some error (mostly network) if may not fetch any data when indexing block. If block cache update is triggered it fails. This PR check if list is passed to cache update function. --- apps/indexer/lib/indexer/block/fetcher.ex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index 6a4eb3661b..a8b28d1391 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -183,7 +183,7 @@ defmodule Indexer.Block.Fetcher do end end - defp update_block_cache(blocks) do + defp update_block_cache(blocks) when is_list(blocks) do max_block = Enum.max_by(blocks, fn block -> block.number end) min_block = Enum.min_by(blocks, fn block -> block.number end) @@ -192,6 +192,8 @@ defmodule Indexer.Block.Fetcher do BlocksCache.update(blocks) end + defp update_block_cache(_), do: :ok + defp update_transactions_cache(transactions) do Transactions.update(transactions) end From dc4ad23953db4edbdd676b08b284e095917b02af Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 23 Aug 2019 15:34:33 +0300 Subject: [PATCH 246/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c26c016be..6c8c5cbf3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted - [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically - [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases - [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error From b38c6d1e65b02ba053237046d577acdfbb8473dc Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 11:57:22 +0300 Subject: [PATCH 247/290] fix transaction assign in view --- .../lib/block_scout_web/templates/address_logs/_logs.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index 527a63feab..790e463981 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -5,7 +5,7 @@ <%= {:error, :contract_not_verified, _cadidates} -> %>
    <%= gettext "To see accurate decoded input data, the contract must be verified." %> - <%= case @transaction do %> + <%= case @log.transaction do %> <% %{to_address: %{hash: hash}} -> %> <%= gettext "Verify the contract " %><%= gettext "here" %> <% _ -> %> From d108e541a19b8801d36008b3657344b89e97bfe4 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 12:05:23 +0300 Subject: [PATCH 248/290] fix html for address logs view --- .../lib/block_scout_web/templates/address_logs/_logs.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index 790e463981..92a8ebc6cc 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -1,5 +1,4 @@
    "> -
    <% decoded_result = decode(@log, @log.transaction) %> <%= case decoded_result do %> <%= {:error, :contract_not_verified, _cadidates} -> %> @@ -15,6 +14,7 @@ <% _ -> %> <%= nil %> <% end %> +
    <%= gettext "Transaction" %>

    From b007451f0671567f5eda9326550b1725380fbe15 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 12:10:04 +0300 Subject: [PATCH 249/290] fix a blinking test The test was failing because `RollingWindow` process is already initialized in `setup` hook --- .../test/ethereum_jsonrpc/rolling_window_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs index 43f400434a..d053a66493 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs @@ -29,7 +29,7 @@ defmodule EthereumJSONRPC.RollingWindowTest do describe "init/1" do test "raises when duration isn't evenly divisble by window_count" do assert_raise ArgumentError, ~r"evenly divisible", fn -> - RollingWindow.init(table: @table, duration: :timer.seconds(2), window_count: 3) + RollingWindow.init(table: :init_test_table, duration: :timer.seconds(2), window_count: 3) end end From dfbc6fa7fe2c19c06c2c241bcb2293e22dd0a214 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 12:21:01 +0300 Subject: [PATCH 250/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c26c016be..2ee0459051 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test - [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css - [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload From e6a65b82a3b221738a3b0e2885355b19685d2dbb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 13:46:58 +0300 Subject: [PATCH 251/290] fix tests --- .../ethereum_jsonrpc/rolling_window_test.exs | 114 ++++++++++-------- 1 file changed, 64 insertions(+), 50 deletions(-) diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs index d053a66493..5f8db2a821 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/rolling_window_test.exs @@ -1,27 +1,8 @@ defmodule EthereumJSONRPC.RollingWindowTest do - use ExUnit.Case, - # The same named process is used for all tests and they use the same key in the table, so they would interfere - async: false + use ExUnit.Case, async: true alias EthereumJSONRPC.RollingWindow - @table :table - - setup do - # We set `window_length` to a large time frame so that we can sweep manually to simulate - # time passing - {:ok, pid} = - RollingWindow.start_link([table: @table, duration: :timer.minutes(120), window_count: 3], name: RollingWindow) - - on_exit(fn -> Process.exit(pid, :normal) end) - - :ok - end - - defp sweep do - GenServer.call(RollingWindow, :sweep) - end - test "start_link/2" do assert {:ok, _} = RollingWindow.start_link(table: :test_table, duration: 5, window_count: 1) end @@ -40,61 +21,85 @@ defmodule EthereumJSONRPC.RollingWindowTest do end test "when no increments have happened, inspect returns an empty list" do - assert RollingWindow.inspect(@table, :foobar) == [] + table = :no_increments_have_happened + start_rolling_window(table) + + assert RollingWindow.inspect(table, :foobar) == [] end test "when no increments have happened, count returns 0" do - assert RollingWindow.count(@table, :foobar) == 0 + table = :no_increments_have_happened_empty_list + start_rolling_window(table) + + assert RollingWindow.count(table, :foobar) == 0 end test "when an increment has happened, inspect returns the count for that window" do - RollingWindow.inc(@table, :foobar) + table = :no_increments_have_happened_count + start_rolling_window(table) - assert RollingWindow.inspect(@table, :foobar) == [1] + RollingWindow.inc(table, :foobar) + + assert RollingWindow.inspect(table, :foobar) == [1] end test "when an increment has happened, count returns the count for that window" do - RollingWindow.inc(@table, :foobar) + table = :no_increments_have_happened_count1 + start_rolling_window(table) + + RollingWindow.inc(table, :foobar) - assert RollingWindow.count(@table, :foobar) == 1 + assert RollingWindow.count(table, :foobar) == 1 end test "when an increment has happened in multiple windows, inspect returns the count for both windows" do - RollingWindow.inc(@table, :foobar) - sweep() - RollingWindow.inc(@table, :foobar) + table = :no_increments_have_happened_multiple_windows + start_rolling_window(table) - assert RollingWindow.inspect(@table, :foobar) == [1, 1] + RollingWindow.inc(table, :foobar) + sweep(table) + RollingWindow.inc(table, :foobar) + + assert RollingWindow.inspect(table, :foobar) == [1, 1] end test "when an increment has happened in multiple windows, count returns the sum of both windows" do - RollingWindow.inc(@table, :foobar) - sweep() - RollingWindow.inc(@table, :foobar) + table = :no_increments_have_happened_multiple_windows1 + start_rolling_window(table) + + RollingWindow.inc(table, :foobar) + sweep(table) + RollingWindow.inc(table, :foobar) - assert RollingWindow.count(@table, :foobar) == 2 + assert RollingWindow.count(table, :foobar) == 2 end test "when an increment has happened, but has been swept times, it no longer appears in inspect" do - RollingWindow.inc(@table, :foobar) - sweep() - sweep() - RollingWindow.inc(@table, :foobar) - sweep() - RollingWindow.inc(@table, :foobar) - - assert RollingWindow.inspect(@table, :foobar) == [1, 1, 0] + table = :no_increments_have_happened_multiple_windows3 + start_rolling_window(table) + + RollingWindow.inc(table, :foobar) + sweep(table) + sweep(table) + RollingWindow.inc(table, :foobar) + sweep(table) + RollingWindow.inc(table, :foobar) + + assert RollingWindow.inspect(table, :foobar) == [1, 1, 0] end test "when an increment has happened, but has been swept times, it no longer is included in count" do - RollingWindow.inc(@table, :foobar) - sweep() - sweep() - RollingWindow.inc(@table, :foobar) - sweep() - RollingWindow.inc(@table, :foobar) - - assert RollingWindow.count(@table, :foobar) == 2 + table = :no_increments_have_happened_multiple_windows4 + start_rolling_window(table) + + RollingWindow.inc(table, :foobar) + sweep(table) + sweep(table) + RollingWindow.inc(table, :foobar) + sweep(table) + RollingWindow.inc(table, :foobar) + + assert RollingWindow.count(table, :foobar) == 2 end test "sweeping schedules another sweep" do @@ -102,4 +107,13 @@ defmodule EthereumJSONRPC.RollingWindowTest do RollingWindow.handle_info(:sweep, state) assert_receive(:sweep) end + + defp start_rolling_window(table_name) do + {:ok, _pid} = + RollingWindow.start_link([table: table_name, duration: :timer.minutes(120), window_count: 3], name: table_name) + end + + defp sweep(name) do + GenServer.call(name, :sweep) + end end From 3d732bd4b40129297b59b585f79631fde24500dd Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 14:13:14 +0300 Subject: [PATCH 252/290] fix rpc/address_controller test --- .../api/rpc/address_controller_test.exs | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) 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 7e88d4717f..96716f0935 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 @@ -2266,7 +2266,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do end test "returns all the required fields", %{conn: conn} do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block = insert(:block, number: Enum.random(Range.new(range.from, range.to))) @@ -2274,17 +2274,10 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> insert(gas_price: 1) |> with_block(block, gas_used: 1) - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(1)) - |> Wei.from(:wei) - expected_result = [ %{ "blockNumber" => to_string(block.number), - "timeStamp" => to_string(block.timestamp), - "blockReward" => to_string(expected_reward.value) + "timeStamp" => to_string(block.timestamp) } ] @@ -2306,7 +2299,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do end test "with a block with one transaction", %{conn: conn} do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block = insert(:block, number: Enum.random(Range.new(range.from, range.to))) @@ -2314,12 +2307,6 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> insert(gas_price: 1) |> with_block(block, gas_used: 1) - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(1)) - |> Wei.from(:wei) - params = %{ "module" => "account", "action" => "getminedblocks", @@ -2329,8 +2316,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do expected_result = [ %{ "blockNumber" => to_string(block.number), - "timeStamp" => to_string(block.timestamp), - "blockReward" => to_string(expected_reward.value) + "timeStamp" => to_string(block.timestamp) } ] @@ -2346,7 +2332,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do end test "with pagination options", %{conn: conn} do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block_numbers = Range.new(range.from, range.to) @@ -2361,12 +2347,6 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do |> insert(gas_price: 2) |> with_block(block2, gas_used: 2) - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(4)) - |> Wei.from(:wei) - params = %{ "module" => "account", "action" => "getminedblocks", @@ -2380,8 +2360,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do expected_result = [ %{ "blockNumber" => to_string(block2.number), - "timeStamp" => to_string(block2.timestamp), - "blockReward" => to_string(expected_reward.value) + "timeStamp" => to_string(block2.timestamp) } ] @@ -2683,7 +2662,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do }) end - defp resolve_schema(result \\ %{}) do + defp resolve_schema(result) do %{ "type" => "object", "properties" => %{ From 4b19c5557459ab0d40407469a47b2be2cf75010f Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Aug 2019 14:20:40 +0300 Subject: [PATCH 253/290] fix explorer/etherscan tests --- .../explorer/test/explorer/etherscan_test.exs | 97 +++---------------- 1 file changed, 13 insertions(+), 84 deletions(-) diff --git a/apps/explorer/test/explorer/etherscan_test.exs b/apps/explorer/test/explorer/etherscan_test.exs index 420dd3e7d2..ded7f2cc30 100644 --- a/apps/explorer/test/explorer/etherscan_test.exs +++ b/apps/explorer/test/explorer/etherscan_test.exs @@ -4,7 +4,7 @@ defmodule Explorer.EtherscanTest do import Explorer.Factory alias Explorer.{Etherscan, Chain} - alias Explorer.Chain.{Transaction, Wei} + alias Explorer.Chain.Transaction describe "list_transactions/2" do test "with empty db" do @@ -1170,7 +1170,7 @@ defmodule Explorer.EtherscanTest do describe "list_blocks/1" do test "it returns all required fields" do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block = insert(:block, number: Enum.random(Range.new(range.from, range.to))) @@ -1181,17 +1181,10 @@ defmodule Explorer.EtherscanTest do |> insert(gas_price: 1) |> with_block(block, gas_used: 1) - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(1)) - |> Wei.from(:wei) - expected = [ %{ number: block.number, - timestamp: block.timestamp, - reward: expected_reward + timestamp: block.timestamp } ] @@ -1199,32 +1192,14 @@ defmodule Explorer.EtherscanTest do end test "with block containing multiple transactions" do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block = insert(:block, number: Enum.random(Range.new(range.from, range.to))) - # irrelevant transaction - insert(:transaction) - - :transaction - |> insert(gas_price: 1) - |> with_block(block, gas_used: 1) - - :transaction - |> insert(gas_price: 1) - |> with_block(block, gas_used: 2) - - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(3)) - |> Wei.from(:wei) - expected = [ %{ number: block.number, - timestamp: block.timestamp, - reward: expected_reward + timestamp: block.timestamp } ] @@ -1232,7 +1207,7 @@ defmodule Explorer.EtherscanTest do end test "with block without transactions" do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block = insert(:block, number: Enum.random(Range.new(range.from, range.to))) @@ -1242,8 +1217,7 @@ defmodule Explorer.EtherscanTest do expected = [ %{ number: block.number, - timestamp: block.timestamp, - reward: emission_reward.reward + timestamp: block.timestamp } ] @@ -1251,7 +1225,7 @@ defmodule Explorer.EtherscanTest do end test "with multiple blocks" do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block_numbers = Range.new(range.from, range.to) @@ -1262,47 +1236,14 @@ defmodule Explorer.EtherscanTest do block1 = insert(:block, number: block_number1, miner: address) block2 = insert(:block, number: block_number2, miner: address) - # irrelevant transaction - insert(:transaction) - - :transaction - |> insert(gas_price: 2) - |> with_block(block1, gas_used: 2) - - :transaction - |> insert(gas_price: 2) - |> with_block(block1, gas_used: 2) - - :transaction - |> insert(gas_price: 3) - |> with_block(block2, gas_used: 3) - - :transaction - |> insert(gas_price: 3) - |> with_block(block2, gas_used: 3) - - expected_reward_block1 = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(8)) - |> Wei.from(:wei) - - expected_reward_block2 = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(18)) - |> Wei.from(:wei) - expected = [ %{ number: block2.number, - timestamp: block2.timestamp, - reward: expected_reward_block2 + timestamp: block2.timestamp }, %{ number: block1.number, - timestamp: block1.timestamp, - reward: expected_reward_block1 + timestamp: block1.timestamp } ] @@ -1310,7 +1251,7 @@ defmodule Explorer.EtherscanTest do end test "with pagination options" do - %{block_range: range} = emission_reward = insert(:emission_reward) + %{block_range: range} = insert(:emission_reward) block_numbers = Range.new(range.from, range.to) @@ -1321,29 +1262,17 @@ defmodule Explorer.EtherscanTest do block1 = insert(:block, number: block_number1, miner: address) block2 = insert(:block, number: block_number2, miner: address) - :transaction - |> insert(gas_price: 2) - |> with_block(block1, gas_used: 2) - - expected_reward = - emission_reward.reward - |> Wei.to(:wei) - |> Decimal.add(Decimal.new(4)) - |> Wei.from(:wei) - expected1 = [ %{ number: block2.number, - timestamp: block2.timestamp, - reward: emission_reward.reward + timestamp: block2.timestamp } ] expected2 = [ %{ number: block1.number, - timestamp: block1.timestamp, - reward: expected_reward + timestamp: block1.timestamp } ] From 66dec0c4591f9b6491bcc44615edb5d88d5d11ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 11:49:24 +0000 Subject: [PATCH 254/290] Bump jquery from 3.3.1 to 3.4.0 in /apps/block_scout_web/assets Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.3.1...3.4.0) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- apps/block_scout_web/assets/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 2c78f45f55..1545e3b759 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -6723,9 +6723,9 @@ } }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.0.tgz", + "integrity": "sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==" }, "js-base64": { "version": "2.4.5", diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index 98fbc501d6..1169e22859 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -29,7 +29,7 @@ "highlight.js": "^9.13.1", "highlightjs-solidity": "^1.0.6", "humps": "^2.0.1", - "jquery": "^3.3.1", + "jquery": "^3.4.0", "lodash": "^4.17.13", "moment": "^2.22.1", "nanomorph": "^5.1.3", From 8491259093ee93aa3371c05e9e159f1fa2d87d29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 11:50:18 +0000 Subject: [PATCH 255/290] Bump lodash from 4.17.13 to 4.17.15 in /apps/block_scout_web/assets Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.15) Signed-off-by: dependabot[bot] --- apps/block_scout_web/assets/package-lock.json | 6 +++--- apps/block_scout_web/assets/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 2c78f45f55..9747ccfe67 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -6961,9 +6961,9 @@ } }, "lodash": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.assign": { "version": "4.2.0", diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index 98fbc501d6..30845a3be3 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -30,7 +30,7 @@ "highlightjs-solidity": "^1.0.6", "humps": "^2.0.1", "jquery": "^3.3.1", - "lodash": "^4.17.13", + "lodash": "^4.17.15", "moment": "^2.22.1", "nanomorph": "^5.1.3", "numeral": "^2.0.6", From 3f30610dde9a3f2d425552c1696069f84c6c557b Mon Sep 17 00:00:00 2001 From: pasqu4le Date: Thu, 15 Aug 2019 20:36:48 +0200 Subject: [PATCH 256/290] Add generic Map-like Cache behaviour and implementation Problem: multiple caches exist that contain some data as a map (key-value storing). More are to be implemented, so it would be good to abstract their implementation. Solution: add a behaviour and a macro (providing an implementation) to create this type of caches. At the same time, where possible: - redefine the existing ones using the new macro - optimize the implementation --- CHANGELOG.md | 1 + .../controllers/api/rpc/block_controller.ex | 2 +- .../controllers/block_controller_test.exs | 4 +- .../controllers/chain_controller_test.exs | 4 +- .../features/viewing_chain_test.exs | 4 +- apps/explorer/lib/explorer/application.ex | 9 +- apps/explorer/lib/explorer/chain.ex | 36 +-- apps/explorer/lib/explorer/chain/address.ex | 2 +- .../lib/explorer/chain/cache/block_count.ex | 168 ++++---------- .../lib/explorer/chain/cache/block_number.ex | 91 ++------ .../lib/explorer/chain/cache/net_version.ex | 47 ++-- .../explorer/chain/cache/transaction_count.ex | 174 ++++---------- apps/explorer/lib/explorer/chain/map_cache.ex | 217 ++++++++++++++++++ .../explorer/lib/explorer/chain/supply/rsk.ex | 2 +- .../explorer/chain/cache/block_count_test.exs | 26 +-- .../chain/cache/block_number_test.exs | 50 ++-- .../test/explorer/chain/cache/blocks_test.exs | 4 +- .../chain/cache/transaction_count_test.exs | 26 +-- apps/explorer/test/explorer/chain_test.exs | 24 +- apps/explorer/test/support/data_case.ex | 3 +- apps/indexer/lib/indexer/block/fetcher.ex | 9 +- .../indexer/fetcher/coin_balance_on_demand.ex | 2 +- 22 files changed, 458 insertions(+), 447 deletions(-) create mode 100644 apps/explorer/lib/explorer/chain/map_cache.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index f8335319cb..0f8742c44b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#2581](https://github.com/poanetwork/blockscout/pull/2581) - Add generic Map-like Cache behaviour and implementation - [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type - [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method - [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex index 835e19bf3e..2b9bdc0dd6 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex @@ -26,7 +26,7 @@ defmodule BlockScoutWeb.API.RPC.BlockController do def eth_block_number(conn, params) do id = Map.get(params, "id", 1) - max_block_number = BlockNumber.max_number() + max_block_number = BlockNumber.get_max() render(conn, :eth_block_number, number: max_block_number, id: id) end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs index e8c4af7de8..6c0bfabfa0 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs @@ -3,8 +3,8 @@ defmodule BlockScoutWeb.BlockControllerTest do alias Explorer.Chain.Block setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, :blocks}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, :blocks}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) :ok end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs index 00a53689c8..fa82bb5bab 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs @@ -9,8 +9,8 @@ defmodule BlockScoutWeb.ChainControllerTest do alias Explorer.Counters.AddressesWithBalanceCounter setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, :blocks}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, :blocks}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) start_supervised!(AddressesWithBalanceCounter) AddressesWithBalanceCounter.consolidate() diff --git a/apps/block_scout_web/test/block_scout_web/features/viewing_chain_test.exs b/apps/block_scout_web/test/block_scout_web/features/viewing_chain_test.exs index a32e4f5da3..27b4dbb329 100644 --- a/apps/block_scout_web/test/block_scout_web/features/viewing_chain_test.exs +++ b/apps/block_scout_web/test/block_scout_web/features/viewing_chain_test.exs @@ -10,8 +10,8 @@ defmodule BlockScoutWeb.ViewingChainTest do alias Explorer.Counters.AddressesWithBalanceCounter setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, :blocks}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, :blocks}) + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) Enum.map(401..404, &insert(:block, number: &1)) diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex index c28469c340..1bd2778762 100644 --- a/apps/explorer/lib/explorer/application.ex +++ b/apps/explorer/lib/explorer/application.ex @@ -42,10 +42,11 @@ defmodule Explorer.Application do Explorer.SmartContract.SolcDownloader, {Registry, keys: :duplicate, name: Registry.ChainEvents, id: Registry.ChainEvents}, {Admin.Recovery, [[], [name: Admin.Recovery]]}, - {TransactionCount, [[], []]}, - {BlockCount, []}, + TransactionCount, + BlockCount, Blocks, - con_cache_child_spec(NetVersion.cache_name()), + NetVersion, + BlockNumber, con_cache_child_spec(MarketHistoryCache.cache_name()), con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)), Transactions @@ -57,8 +58,6 @@ defmodule Explorer.Application do res = Supervisor.start_link(children, opts) - BlockNumber.setup() - res end diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 58253c0f27..eac7f3ce6f 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -267,7 +267,7 @@ defmodule Explorer.Chain do def address_to_logs(address_hash, options \\ []) when is_list(options) do paging_options = Keyword.get(options, :paging_options) || %PagingOptions{page_size: 50} - {block_number, transaction_index, log_index} = paging_options.key || {BlockNumber.max_number(), 0, 0} + {block_number, transaction_index, log_index} = paging_options.key || {BlockNumber.get_max(), 0, 0} base_query = from(log in Log, @@ -1176,7 +1176,7 @@ defmodule Explorer.Chain do """ @spec indexed_ratio() :: Decimal.t() def indexed_ratio do - {min, max} = BlockNumber.min_and_max_numbers() + %{min: min, max: max} = BlockNumber.get_all() case {min, max} do {0, 0} -> @@ -1189,20 +1189,30 @@ defmodule Explorer.Chain do end end - @spec fetch_min_and_max_block_numbers() :: {non_neg_integer, non_neg_integer} - def fetch_min_and_max_block_numbers do + @spec fetch_min_block_number() :: non_neg_integer + def fetch_min_block_number do query = from(block in Block, - select: {min(block.number), max(block.number)}, - where: block.consensus == true + select: block.number, + where: block.consensus == true, + order_by: [asc: block.number], + limit: 1 ) - result = Repo.one!(query) + Repo.one(query) || 0 + end - case result do - {nil, nil} -> {0, 0} - _ -> result - end + @spec fetch_max_block_number() :: non_neg_integer + def fetch_max_block_number do + query = + from(block in Block, + select: block.number, + where: block.consensus == true, + order_by: [desc: block.number], + limit: 1 + ) + + Repo.one(query) || 0 end @spec fetch_count_consensus_block() :: non_neg_integer @@ -2195,7 +2205,7 @@ defmodule Explorer.Chain do """ @spec transaction_estimated_count() :: non_neg_integer() def transaction_estimated_count do - cached_value = TransactionCount.value() + cached_value = TransactionCount.get_count() if is_nil(cached_value) do %Postgrex.Result{rows: [[rows]]} = @@ -2214,7 +2224,7 @@ defmodule Explorer.Chain do """ @spec block_estimated_count() :: non_neg_integer() def block_estimated_count do - cached_value = BlockCount.count() + cached_value = BlockCount.get_count() if is_nil(cached_value) do %Postgrex.Result{rows: [[count]]} = Repo.query!("SELECT reltuples FROM pg_class WHERE relname = 'blocks';") diff --git a/apps/explorer/lib/explorer/chain/address.ex b/apps/explorer/lib/explorer/chain/address.ex index 478c35deb1..96d4dc7ab4 100644 --- a/apps/explorer/lib/explorer/chain/address.ex +++ b/apps/explorer/lib/explorer/chain/address.ex @@ -170,7 +170,7 @@ defmodule Explorer.Chain.Address do end def rsk_checksum(hash) do - chain_id = NetVersion.version() + chain_id = NetVersion.get_version() string_hash = hash diff --git a/apps/explorer/lib/explorer/chain/cache/block_count.ex b/apps/explorer/lib/explorer/chain/cache/block_count.ex index 8ba09cc86f..c4e6c6a4a0 100644 --- a/apps/explorer/lib/explorer/chain/cache/block_count.ex +++ b/apps/explorer/lib/explorer/chain/cache/block_count.ex @@ -5,143 +5,61 @@ defmodule Explorer.Chain.Cache.BlockCount do require Logger - use GenServer + @default_cache_period :timer.minutes(10) - alias Explorer.Chain - - # 10 minutes - @cache_period 1_000 * 60 * 10 - @key "count" - @default_value nil - @name __MODULE__ - - def start_link(params) do - name = params[:name] || @name - params_with_name = Keyword.put(params, :name, name) - - GenServer.start_link(__MODULE__, params_with_name, name: name) - end - - def init(params) do - cache_period = period_from_env_var() || params[:cache_period] || @cache_period - current_value = params[:default_value] || @default_value - name = params[:name] - - init_ets_table(name) - - {:ok, {{cache_period, current_value, name}, nil}} - end - - def count(process_name \\ __MODULE__) do - GenServer.call(process_name, :count) - end - - def handle_call(:count, _, {{cache_period, default_value, name}, task}) do - {count, task} = - case cached_values(name) do - nil -> - {default_value, update_cache(task, name)} - - {cached_value, timestamp} -> - task = - if current_time() - timestamp > cache_period do - update_cache(task, name) - end - - {cached_value, task} - end - - {:reply, count, {{cache_period, default_value, name}, task}} - end - - def update_cache(nil, name) do - async_update_cache(name) - end - - def update_cache(task, _) do - task - end + use Explorer.Chain.MapCache, + name: :block_count, + key: :count, + key: :async_task, + global_ttl: cache_period(), + ttl_check_interval: :timer.minutes(1), + callback: &async_task_on_deletion(&1) - def handle_cast({:update_cache, value}, {{cache_period, default_value, name}, _}) do - current_time = current_time() - tuple = {value, current_time} - - table_name = table_name(name) - - :ets.insert(table_name, {@key, tuple}) - - {:noreply, {{cache_period, default_value, name}, nil}} - end - - def handle_info({:DOWN, _, _, _, _}, {{cache_period, default_value, name}, _}) do - {:noreply, {{cache_period, default_value, name}, nil}} - end - - def handle_info(_, {{cache_period, default_value, name}, _}) do - {:noreply, {{cache_period, default_value, name}, nil}} - end - - # sobelow_skip ["DOS"] - defp table_name(name) do - name - |> Atom.to_string() - |> Macro.underscore() - |> String.to_atom() - end + alias Explorer.Chain - def async_update_cache(name) do - Task.async(fn -> - try do - result = Chain.fetch_count_consensus_block() + defp handle_fallback(:count) do + # This will get the task PID if one exists and launch a new task if not + # See next `handle_fallback` definition + get_async_task() - GenServer.cast(name, {:update_cache, result}) - rescue - e -> - Logger.debug([ - "Coudn't update block count test #{inspect(e)}" - ]) - end - end) + {:return, nil} end - defp init_ets_table(name) do - table_name = table_name(name) - - if :ets.whereis(table_name) == :undefined do - :ets.new(table_name, [ - :set, - :named_table, - :public, - write_concurrency: true - ]) - end - end + defp handle_fallback(:async_task) do + # If this gets called it means an async task was requested, but none exists + # so a new one needs to be launched + task = + Task.async(fn -> + try do + result = Chain.fetch_count_consensus_block() + + set_count(result) + rescue + e -> + Logger.debug([ + "Coudn't update block count test #{inspect(e)}" + ]) + end - defp cached_values(name) do - table_name = table_name(name) + set_async_task(nil) + end) - case :ets.lookup(table_name, @key) do - [{_, cached_values}] -> cached_values - _ -> nil - end + {:update, task} end - defp current_time do - utc_now = DateTime.utc_now() - - DateTime.to_unix(utc_now, :millisecond) - end + # By setting this as a `callback` an async task will be started each time the + # `count` expires (unless there is one already running) + defp async_task_on_deletion({:delete, _, :count}), do: get_async_task() - defp period_from_env_var do - case System.get_env("BLOCK_COUNT_CACHE_PERIOD") do - value when is_binary(value) -> - case Integer.parse(value) do - {integer, ""} -> integer * 1_000 - _ -> nil - end + defp async_task_on_deletion(_data), do: nil - _ -> - nil + defp cache_period do + "BLOCK_COUNT_CACHE_PERIOD" + |> System.get_env("") + |> Integer.parse() + |> case do + {integer, ""} -> :timer.seconds(integer) + _ -> @default_cache_period end end end diff --git a/apps/explorer/lib/explorer/chain/cache/block_number.ex b/apps/explorer/lib/explorer/chain/cache/block_number.ex index 5212117793..d19551fa59 100644 --- a/apps/explorer/lib/explorer/chain/cache/block_number.ex +++ b/apps/explorer/lib/explorer/chain/cache/block_number.ex @@ -3,89 +3,36 @@ defmodule Explorer.Chain.Cache.BlockNumber do Cache for max and min block numbers. """ - alias Explorer.Chain - - @tab :block_number_cache - @key "min_max" + @type value :: non_neg_integer() - @spec setup() :: :ok - def setup do - if :ets.whereis(@tab) == :undefined do - :ets.new(@tab, [ - :set, - :named_table, - :public, - write_concurrency: true - ]) - end + use Explorer.Chain.MapCache, + name: :block_number, + keys: [:min, :max] - update_cache() - - :ok - end + alias Explorer.Chain - def max_number do - value(:max) - end + defp handle_update(_key, nil, value), do: {:ok, value} - def min_number do - value(:min) - end + defp handle_update(:min, old_value, new_value), do: {:ok, min(new_value, old_value)} - def min_and_max_numbers do - value(:all) - end + defp handle_update(:max, old_value, new_value), do: {:ok, max(new_value, old_value)} - defp value(type) do - {min, max} = - if Application.get_env(:explorer, __MODULE__)[:enabled] do - cached_values() - else - min_and_max_from_db() - end + defp handle_fallback(key) do + result = fetch_from_db(key) - case type do - :max -> max - :min -> min - :all -> {min, max} + if Application.get_env(:explorer, __MODULE__)[:enabled] do + {:update, result} + else + {:return, result} end end - @spec update(non_neg_integer()) :: boolean() - def update(number) do - {old_min, old_max} = cached_values() - - cond do - number > old_max -> - tuple = {old_min, number} - :ets.insert(@tab, {@key, tuple}) - - number < old_min -> - tuple = {number, old_max} - :ets.insert(@tab, {@key, tuple}) - - true -> - false + defp fetch_from_db(key) do + case key do + :min -> Chain.fetch_min_block_number() + :max -> Chain.fetch_max_block_number() end - end - - defp update_cache do - {min, max} = min_and_max_from_db() - tuple = {min, max} - - :ets.insert(@tab, {@key, tuple}) - end - - defp cached_values do - [{_, cached_values}] = :ets.lookup(@tab, @key) - - cached_values - end - - defp min_and_max_from_db do - Chain.fetch_min_and_max_block_numbers() rescue - _e -> - {0, 0} + _e -> 0 end end diff --git a/apps/explorer/lib/explorer/chain/cache/net_version.ex b/apps/explorer/lib/explorer/chain/cache/net_version.ex index ac33ca8f45..4a5c0cd144 100644 --- a/apps/explorer/lib/explorer/chain/cache/net_version.ex +++ b/apps/explorer/lib/explorer/chain/cache/net_version.ex @@ -3,42 +3,27 @@ defmodule Explorer.Chain.Cache.NetVersion do Caches chain version. """ - @cache_name :net_version - @key :version + @json_rpc_named_arguments Application.get_env(:explorer, :json_rpc_named_arguments) - @spec version() :: non_neg_integer() | {:error, any()} - def version do - cached_value = fetch_from_cache() + require Logger - if is_nil(cached_value) do - fetch_from_node() - else - cached_value - end - end - - def cache_name do - @cache_name - end - - defp fetch_from_cache do - ConCache.get(@cache_name, @key) - end + use Explorer.Chain.MapCache, + name: :net_version, + key: :version - defp cache_value(value) do - ConCache.put(@cache_name, @key, value) - end - - defp fetch_from_node do - json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments) - - case EthereumJSONRPC.fetch_net_version(json_rpc_named_arguments) do + defp handle_fallback(:version) do + case EthereumJSONRPC.fetch_net_version(@json_rpc_named_arguments) do {:ok, value} -> - cache_value(value) - value + {:update, value} - other -> - other + {:error, reason} -> + Logger.debug([ + "Coudn't fetch net_version, reason: #{inspect(reason)}" + ]) + + {:return, nil} end end + + defp handle_fallback(_key), do: {:return, nil} end diff --git a/apps/explorer/lib/explorer/chain/cache/transaction_count.ex b/apps/explorer/lib/explorer/chain/cache/transaction_count.ex index e1fe2dad82..e81bae7414 100644 --- a/apps/explorer/lib/explorer/chain/cache/transaction_count.ex +++ b/apps/explorer/lib/explorer/chain/cache/transaction_count.ex @@ -3,152 +3,64 @@ defmodule Explorer.Chain.Cache.TransactionCount do Cache for estimated transaction count. """ - require Logger + @default_cache_period :timer.hours(2) + + use Explorer.Chain.MapCache, + name: :transaction_count, + key: :count, + key: :async_task, + global_ttl: cache_period(), + ttl_check_interval: :timer.minutes(10), + callback: &async_task_on_deletion(&1) - use GenServer + require Logger alias Explorer.Chain.Transaction alias Explorer.Repo - # 2 hours - @cache_period 1_000 * 60 * 60 * 2 - @default_value nil - @key "count" - @name __MODULE__ - - def start_link([params, gen_server_options]) do - name = gen_server_options[:name] || @name - params_with_name = Keyword.put(params, :name, name) - - GenServer.start_link(__MODULE__, params_with_name, name: name) - end - - def init(params) do - cache_period = period_from_env_var() || params[:cache_period] || @cache_period - current_value = params[:default_value] || @default_value - name = params[:name] - - init_ets_table(name) - - schedule_cache_update() - - {:ok, {{cache_period, current_value, name}, nil}} - end - - def value(process_name \\ __MODULE__) do - GenServer.call(process_name, :value) - end - - def handle_call(:value, _, {{cache_period, default_value, name}, task}) do - {value, task} = - case cached_values(name) do - nil -> - {default_value, update_cache(task, name)} + defp handle_fallback(:count) do + # This will get the task PID if one exists and launch a new task if not + # See next `handle_fallback` definition + get_async_task() - {cached_value, timestamp} -> - task = - if current_time() - timestamp > cache_period do - update_cache(task, name) - end - - {cached_value, task} - end - - {:reply, value, {{cache_period, default_value, name}, task}} + {:return, nil} end - def update_cache(nil, name) do - async_update_cache(name) - end - - def update_cache(task, _) do - task - end - - def handle_cast({:update_cache, value}, {{cache_period, default_value, name}, _}) do - current_time = current_time() - tuple = {value, current_time} - - table_name = table_name(name) - - :ets.insert(table_name, {@key, tuple}) + defp handle_fallback(:async_task) do + # If this gets called it means an async task was requested, but none exists + # so a new one needs to be launched + task = + Task.async(fn -> + try do + result = Repo.aggregate(Transaction, :count, :hash, timeout: :infinity) - {:noreply, {{cache_period, default_value, name}, nil}} - end - - def handle_info({:DOWN, _, _, _, _}, {{cache_period, default_value, name}, _}) do - {:noreply, {{cache_period, default_value, name}, nil}} - end - - def handle_info(_, {{cache_period, default_value, name}, _}) do - {:noreply, {{cache_period, default_value, name}, nil}} - end - - # sobelow_skip ["DOS"] - defp table_name(name) do - name - |> Atom.to_string() - |> Macro.underscore() - |> String.to_atom() - end - - def async_update_cache(name) do - Task.async(fn -> - try do - result = Repo.aggregate(Transaction, :count, :hash, timeout: :infinity) - - GenServer.cast(name, {:update_cache, result}) - rescue - e -> - Logger.debug([ - "Coudn't update transaction count test #{inspect(e)}" - ]) - end - end) - end - - defp init_ets_table(name) do - table_name = table_name(name) - - if :ets.whereis(table_name) == :undefined do - :ets.new(table_name, [ - :set, - :named_table, - :public, - write_concurrency: true - ]) - end - end - - defp cached_values(name) do - table_name = table_name(name) + set_count(result) + rescue + e -> + Logger.debug([ + "Coudn't update transaction count test #{inspect(e)}" + ]) + end - case :ets.lookup(table_name, @key) do - [{_, cached_values}] -> cached_values - _ -> nil - end - end + set_async_task(nil) + end) - defp schedule_cache_update do - Process.send_after(self(), :update_cache, 2_000) + {:update, task} end - defp current_time do - utc_now = DateTime.utc_now() + # By setting this as a `callback` an async task will be started each time the + # `count` expires (unless there is one already running) + defp async_task_on_deletion({:delete, _, :count}), do: get_async_task() - DateTime.to_unix(utc_now, :millisecond) - end - - defp period_from_env_var do - case System.get_env("TXS_COUNT_CACHE_PERIOD") do - value when is_binary(value) -> - case Integer.parse(value) do - {integer, ""} -> integer * 1_000 - _ -> nil - end + defp async_task_on_deletion(_data), do: nil - _ -> - nil + defp cache_period do + "TXS_COUNT_CACHE_PERIOD" + |> System.get_env("") + |> Integer.parse() + |> case do + {integer, ""} -> :timer.seconds(integer) + _ -> @default_cache_period end end end diff --git a/apps/explorer/lib/explorer/chain/map_cache.ex b/apps/explorer/lib/explorer/chain/map_cache.ex new file mode 100644 index 0000000000..d50a4c5e44 --- /dev/null +++ b/apps/explorer/lib/explorer/chain/map_cache.ex @@ -0,0 +1,217 @@ +defmodule Explorer.Chain.MapCache do + @moduledoc """ + Behaviour for a map-like cache of elements. + + A macro based on `ConCache` is provided as well, at its minimum it can be used as; + ``` + use Explorer.Chain.MapCache, + name: :name, + keys: [:fst, :snd] + ``` + Note: `keys` can also be set singularly with the option `key`, e.g.: + ``` + use Explorer.Chain.MapCache, + name: :cache, + key: :fst, + key: :snd + ``` + Additionally all of the options accepted by `ConCache.start_link/1` can be + provided as well. By default only `ttl_check_interval:` is set (to `false`). + + ## Named functions + Apart from the functions defined in the behaviour, the macro will also create + 3 named function for each key, for instance for the key `:fst`: + - `get_fst` + - `set_fst` + - `update_fst` + These all work as their respective counterparts with the `t:key/0` parameter. + + ## Callbacks + Apart from the `callback` that can be set as part of the `ConCache` options, + two callbacks esist and can be overridden: + + `c:handle_update/3` will be called whenever an update is issued. It will receive + the `t:key/0` that is going to be updated, the current `t:value/0` that is + stored for said key and the new `t:value/0` to evaluate. + This allows to select what value to keep and do additional processing. + By default this just stores the new `t:value/0`. + + `c:handle_fallback/1` will be called whenever a get is performed and there is no + stored value for the given `t:key/0` (or when the value is `nil`). + It can return 2 different tuples: + - `{:update, value}` that will cause the value to be returned and the `t:key/0` + to be `c:update/2`d + - `{:return, value}` that will cause the value to be returned but not stored + This allows to define of a default value or perform some actions. + By default it will simply `{:return, nil}` + """ + + @type key :: atom() + + @type value :: term() + + @doc """ + An atom that identifies this cache + """ + @callback cache_name :: atom() + + @doc """ + List of `t:key/0`s that the cache contains + """ + @callback cache_keys :: [key()] + + @doc """ + Gets everything in a map + """ + @callback get_all :: map() + + @doc """ + Gets the stored `t:value/0` for a given `t:key/0` + """ + @callback get(atom()) :: value() + + @doc """ + Stores the same `t:value/0` for every `t:key/0` + """ + @callback set_all(value()) :: :ok + + @doc """ + Stores the given `t:value/0` for the given `t:key/0` + """ + @callback set(key(), value()) :: :ok + + @doc """ + Updates every `t:key/0` with the given `t:value/0` + """ + @callback update_all(value()) :: :ok + + @doc """ + Updates the given `t:key/0` (or every `t:key/0` in a list) using the given `t:value/0` + """ + @callback update(key() | [key()], value()) :: :ok + + @doc """ + Gets called during an update for the given `t:key/0` + """ + @callback handle_update(key(), value(), value()) :: {:ok, value()} | {:error, term()} + + @doc """ + Gets called when a `c:get/1` finds no `t:value/0` + """ + @callback handle_fallback(key()) :: {:update, value()} | {:return, value()} + + # credo:disable-for-next-line /Complexity/ + defmacro __using__(opts) when is_list(opts) do + # name is necessary + name = Keyword.fetch!(opts, :name) + keys = Keyword.get(opts, :keys) || Keyword.get_values(opts, :key) + + concache_params = + opts + |> Keyword.drop([:keys, :key]) + |> Keyword.put_new(:ttl_check_interval, false) + + # credo:disable-for-next-line Credo.Check.Refactor.LongQuoteBlocks + quote do + alias Explorer.Chain.MapCache + + @behaviour MapCache + + @dialyzer {:nowarn_function, handle_fallback: 1} + + @impl MapCache + def cache_name, do: unquote(name) + + @impl MapCache + def cache_keys, do: unquote(keys) + + @impl MapCache + def get_all do + Map.new(cache_keys(), fn key -> {key, get(key)} end) + end + + @impl MapCache + def get(key) do + case ConCache.get(cache_name(), key) do + nil -> + case handle_fallback(key) do + {:update, new_value} -> + update(key, new_value) + new_value + + {:return, new_value} -> + new_value + end + + value -> + value + end + end + + @impl MapCache + def set_all(value) do + Enum.each(cache_keys(), &set(&1, value)) + end + + @impl MapCache + def set(key, value) do + ConCache.put(cache_name(), key, value) + end + + @impl MapCache + def update_all(value), do: update(cache_keys(), value) + + @impl MapCache + def update(keys, value) when is_list(keys) do + Enum.each(keys, &update(&1, value)) + end + + @impl MapCache + def update(key, value) do + ConCache.update(cache_name(), key, fn old_val -> handle_update(key, old_val, value) end) + end + + ### Autogenerated named functions + + unquote(Enum.map(keys, &named_functions(&1))) + + ### Overridable callback functions + + @impl MapCache + def handle_update(_key, _old_value, new_value), do: {:ok, new_value} + + @impl MapCache + def handle_fallback(_key), do: {:return, nil} + + defoverridable handle_update: 3, handle_fallback: 1 + + ### Supervisor's child specification + + @doc """ + The child specification for a Supervisor. Note that all the `params` + provided to this function will override the ones set by using the macro + """ + def child_spec(params \\ []) do + params = Keyword.merge(unquote(concache_params), params) + + Supervisor.child_spec({ConCache, params}, id: child_id()) + end + + def child_id, do: {ConCache, cache_name()} + end + end + + # sobelow_skip ["DOS"] + defp named_functions(key) do + quote do + # sobelow_skip ["DOS"] + def unquote(:"get_#{key}")(), do: get(unquote(key)) + + # sobelow_skip ["DOS"] + def unquote(:"set_#{key}")(value), do: set(unquote(key), value) + + # sobelow_skip ["DOS"] + def unquote(:"update_#{key}")(value), do: update(unquote(key), value) + end + end +end diff --git a/apps/explorer/lib/explorer/chain/supply/rsk.ex b/apps/explorer/lib/explorer/chain/supply/rsk.ex index eb7c4571cd..c34cf62d49 100644 --- a/apps/explorer/lib/explorer/chain/supply/rsk.ex +++ b/apps/explorer/lib/explorer/chain/supply/rsk.ex @@ -102,7 +102,7 @@ defmodule Explorer.Chain.Supply.RSK do def cache_name, do: @cache_name defp fetch_circulating_value do - max_number = BlockNumber.max_number() + max_number = BlockNumber.get_max() params = [ %{block_quantity: integer_to_quantity(max_number), hash_data: "0x0000000000000000000000000000000001000006"} diff --git a/apps/explorer/test/explorer/chain/cache/block_count_test.exs b/apps/explorer/test/explorer/chain/cache/block_count_test.exs index 646af8de43..108c929a75 100644 --- a/apps/explorer/test/explorer/chain/cache/block_count_test.exs +++ b/apps/explorer/test/explorer/chain/cache/block_count_test.exs @@ -3,53 +3,53 @@ defmodule Explorer.Chain.Cache.BlockCountTest do alias Explorer.Chain.Cache.BlockCount - test "returns default transaction count" do - BlockCount.start_link(name: BlockTestCache) + setup do + Supervisor.terminate_child(Explorer.Supervisor, BlockCount.child_id()) + Supervisor.restart_child(Explorer.Supervisor, BlockCount.child_id()) + :ok + end - result = BlockCount.count(BlockTestCache) + test "returns default transaction count" do + result = BlockCount.get_count() assert is_nil(result) end test "updates cache if initial value is zero" do - BlockCount.start_link(name: BlockTestCache) - insert(:block, consensus: true) insert(:block, consensus: true) insert(:block, consensus: false) - _result = BlockCount.count(BlockTestCache) + _result = BlockCount.get_count() Process.sleep(1000) - updated_value = BlockCount.count(BlockTestCache) + updated_value = BlockCount.get_count() assert updated_value == 2 end test "does not update cache if cache period did not pass" do - BlockCount.start_link(name: BlockTestCache) - insert(:block, consensus: true) insert(:block, consensus: true) insert(:block, consensus: false) - _result = BlockCount.count(BlockTestCache) + _result = BlockCount.get_count() Process.sleep(1000) - updated_value = BlockCount.count(BlockTestCache) + updated_value = BlockCount.get_count() assert updated_value == 2 insert(:block, consensus: true) insert(:block, consensus: true) - _updated_value = BlockCount.count(BlockTestCache) + _updated_value = BlockCount.get_count() Process.sleep(1000) - updated_value = BlockCount.count(BlockTestCache) + updated_value = BlockCount.get_count() assert updated_value == 2 end diff --git a/apps/explorer/test/explorer/chain/cache/block_number_test.exs b/apps/explorer/test/explorer/chain/cache/block_number_test.exs index 381ded440b..64170695eb 100644 --- a/apps/explorer/test/explorer/chain/cache/block_number_test.exs +++ b/apps/explorer/test/explorer/chain/cache/block_number_test.exs @@ -11,49 +11,63 @@ defmodule Explorer.Chain.Cache.BlockNumberTest do end) end - describe "max_number/1" do + describe "get_max/1" do test "returns max number" do insert(:block, number: 5) - BlockNumber.setup() - - assert BlockNumber.max_number() == 5 + assert BlockNumber.get_max() == 5 end end - describe "min_number/1" do - test "returns max number" do + describe "get_min/1" do + test "returns min number" do insert(:block, number: 2) - BlockNumber.setup() + assert BlockNumber.get_min() == 2 + end + end - assert BlockNumber.max_number() == 2 + describe "get_all/1" do + test "returns min and max number" do + insert(:block, number: 6) + + assert BlockNumber.get_all() == %{min: 6, max: 6} end end - describe "update/1" do + describe "update_all/1" do test "updates max number" do insert(:block, number: 2) - BlockNumber.setup() - - assert BlockNumber.max_number() == 2 + assert BlockNumber.get_max() == 2 - assert BlockNumber.update(3) + assert BlockNumber.update_all(3) - assert BlockNumber.max_number() == 3 + assert BlockNumber.get_max() == 3 end test "updates min number" do insert(:block, number: 2) - BlockNumber.setup() + assert BlockNumber.get_min() == 2 + + assert BlockNumber.update_all(1) + + assert BlockNumber.get_min() == 1 + end + + test "updates min and number" do + insert(:block, number: 2) + + assert BlockNumber.get_all() == %{min: 2, max: 2} + + assert BlockNumber.update_all(1) - assert BlockNumber.min_number() == 2 + assert BlockNumber.get_all() == %{min: 1, max: 2} - assert BlockNumber.update(1) + assert BlockNumber.update_all(6) - assert BlockNumber.min_number() == 1 + assert BlockNumber.get_all() == %{min: 1, max: 6} end end end diff --git a/apps/explorer/test/explorer/chain/cache/blocks_test.exs b/apps/explorer/test/explorer/chain/cache/blocks_test.exs index 87f887ae26..41fe344a1e 100644 --- a/apps/explorer/test/explorer/chain/cache/blocks_test.exs +++ b/apps/explorer/test/explorer/chain/cache/blocks_test.exs @@ -5,8 +5,8 @@ defmodule Explorer.Chain.Cache.BlocksTest do alias Explorer.Repo setup do - Supervisor.terminate_child(Explorer.Supervisor, {ConCache, :blocks}) - Supervisor.restart_child(Explorer.Supervisor, {ConCache, :blocks}) + Supervisor.terminate_child(Explorer.Supervisor, Blocks.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Blocks.child_id()) :ok end diff --git a/apps/explorer/test/explorer/chain/cache/transaction_count_test.exs b/apps/explorer/test/explorer/chain/cache/transaction_count_test.exs index 5020486cb8..5385492de7 100644 --- a/apps/explorer/test/explorer/chain/cache/transaction_count_test.exs +++ b/apps/explorer/test/explorer/chain/cache/transaction_count_test.exs @@ -3,51 +3,51 @@ defmodule Explorer.Chain.Cache.TransactionCountTest do alias Explorer.Chain.Cache.TransactionCount - test "returns default transaction count" do - TransactionCount.start_link([[], [name: TestCache]]) + setup do + Supervisor.terminate_child(Explorer.Supervisor, TransactionCount.child_id()) + Supervisor.restart_child(Explorer.Supervisor, TransactionCount.child_id()) + :ok + end - result = TransactionCount.value(TestCache) + test "returns default transaction count" do + result = TransactionCount.get_count() assert is_nil(result) end test "updates cache if initial value is zero" do - TransactionCount.start_link([[], [name: TestCache]]) - insert(:transaction) insert(:transaction) - _result = TransactionCount.value(TestCache) + _result = TransactionCount.get_count() Process.sleep(1000) - updated_value = TransactionCount.value(TestCache) + updated_value = TransactionCount.get_count() assert updated_value == 2 end test "does not update cache if cache period did not pass" do - TransactionCount.start_link([[], [name: TestCache]]) - insert(:transaction) insert(:transaction) - _result = TransactionCount.value(TestCache) + _result = TransactionCount.get_count() Process.sleep(1000) - updated_value = TransactionCount.value(TestCache) + updated_value = TransactionCount.get_count() assert updated_value == 2 insert(:transaction) insert(:transaction) - _updated_value = TransactionCount.value(TestCache) + _updated_value = TransactionCount.get_count() Process.sleep(1000) - updated_value = TransactionCount.value(TestCache) + updated_value = TransactionCount.get_count() assert updated_value == 2 end diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index f49be6da4e..ee1b8ed987 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -1121,23 +1121,31 @@ defmodule Explorer.ChainTest do end end - describe "fetch_min_and_max_block_numbers/0" do - test "fetches min and max block numbers" do + describe "fetch_min_block_number/0" do + test "fetches min block numbers" do for index <- 5..9 do insert(:block, number: index) end - assert {5, 9} = Chain.fetch_min_and_max_block_numbers() + assert 5 = Chain.fetch_min_block_number() end - test "fetches min and max when there are no blocks" do - assert {0, 0} = Chain.fetch_min_and_max_block_numbers() + test "fetches min when there are no blocks" do + assert 0 = Chain.fetch_min_block_number() end + end - test "fetches min and max where there is only one block" do - insert(:block, number: 1) + describe "fetch_max_block_number/0" do + test "fetches max block numbers" do + for index <- 5..9 do + insert(:block, number: index) + end + + assert 9 = Chain.fetch_max_block_number() + end - assert {1, 1} = Chain.fetch_min_and_max_block_numbers() + test "fetches max when there are no blocks" do + assert 0 = Chain.fetch_max_block_number() end end diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex index fa87839725..47c15bbca0 100644 --- a/apps/explorer/test/support/data_case.ex +++ b/apps/explorer/test/support/data_case.ex @@ -39,7 +39,8 @@ defmodule Explorer.DataCase do Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo, {:shared, self()}) end - Explorer.Chain.Cache.BlockNumber.setup() + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id()) Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id()) diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index a8b28d1391..28002f010a 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -184,11 +184,10 @@ defmodule Indexer.Block.Fetcher do end defp update_block_cache(blocks) when is_list(blocks) do - max_block = Enum.max_by(blocks, fn block -> block.number end) - min_block = Enum.min_by(blocks, fn block -> block.number end) + {min_block, max_block} = Enum.min_max_by(blocks, & &1.number) - BlockNumber.update(max_block.number) - BlockNumber.update(min_block.number) + BlockNumber.update_all(max_block.number) + BlockNumber.update_all(min_block.number) BlocksCache.update(blocks) end @@ -269,7 +268,7 @@ defmodule Indexer.Block.Fetcher do end def async_import_internal_transactions(%{transactions: transactions}, EthereumJSONRPC.Geth) do - {_, max_block_number} = Chain.fetch_min_and_max_block_numbers() + max_block_number = Chain.fetch_max_block_number() transactions |> Enum.flat_map(fn diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex b/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex index 4dfed6e73a..d6d7d66d71 100644 --- a/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex +++ b/apps/indexer/lib/indexer/fetcher/coin_balance_on_demand.ex @@ -162,7 +162,7 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemand do end defp latest_block_number do - BlockNumber.max_number() + BlockNumber.get_max() end defp stale_balance_window(block_number) do From b9f9bbfac7979efdff1f34f475f2bce78adecc04 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Mon, 26 Aug 2019 20:39:29 +0200 Subject: [PATCH 257/290] Removed "nav-item-networks" Having "nav-item-networks" causes the networks menu button on mobile to be pushed to the right, by removing it, it corrects this and moves the menu inline with the rest. --- .../lib/block_scout_web/templates/layout/_topnav.html.eex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 970206636c..a990e73000 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -99,7 +99,7 @@

    <% end %> -
  • +
  • " href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <%= render BlockScoutWeb.IconsView, "_active_icon.html" %> @@ -160,4 +160,4 @@ var modeChanger = document.getElementById("dark-mode-changer"); modeChanger.className += " " + "dark-mode-changer--dark"; } - \ No newline at end of file + From 0a22c43a35ee0fed633090a37d56422a95775cff Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Mon, 26 Aug 2019 20:43:20 +0200 Subject: [PATCH 258/290] Removed 'style="background-color: #22223a"' Having style="background-color: #22223a" causes 2 bars around the top & bottom of the search bar on mobile, removing this removes the bars and sets the color to the theme. It's highly visible on the light theme on mobile. --- .../lib/block_scout_web/templates/layout/_topnav.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index a990e73000..9d640e55e5 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -116,7 +116,7 @@ <%= if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter)[:enabled] do %> -
    +
    <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0", method: :get, enforce_utf8: false], fn f -> %>
    <%= awesomplete(f, :q, From 44ffde690f0b78448e72a181c8752e0f612a4c8c Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 27 Aug 2019 14:56:26 +0300 Subject: [PATCH 259/290] Lukso in networks dropdow --- CHANGELOG.md | 1 + .../assets/css/_images-preload.scss | 1 + .../assets/css/components/_network-selector.scss | 3 +++ .../network-selector-icons/lukso-l14-testnet.png | Bin 0 -> 2312 bytes 4 files changed, 5 insertions(+) create mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png diff --git a/CHANGELOG.md b/CHANGELOG.md index f8335319cb..1a20cf0f14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown - [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities - [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted - [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically diff --git a/apps/block_scout_web/assets/css/_images-preload.scss b/apps/block_scout_web/assets/css/_images-preload.scss index 8356a8f90e..a084daa7a9 100644 --- a/apps/block_scout_web/assets/css/_images-preload.scss +++ b/apps/block_scout_web/assets/css/_images-preload.scss @@ -12,4 +12,5 @@ body:after { url(/images/network-selector-icons/rsk-mainnet.png) url(/images/network-selector-icons/ropsten-testnet.png) url(/images/network-selector-icons/xdai-chain.png) + url(/images/network-selector-icons/lukso-l14-testnet.png) }; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_network-selector.scss b/apps/block_scout_web/assets/css/components/_network-selector.scss index 7f2a4c020d..e4a4991fa7 100644 --- a/apps/block_scout_web/assets/css/components/_network-selector.scss +++ b/apps/block_scout_web/assets/css/components/_network-selector.scss @@ -277,6 +277,9 @@ $network-selector-item-icon-dimensions: 30px !default; &-xdai-chain { background-image: url(/images/network-selector-icons/xdai-chain.png) } + &-lukso-l14-testnet { + background-image: url(/images/network-selector-icons/lukso-l14-testnet.png) + } } .network-selector-item-title { diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png new file mode 100755 index 0000000000000000000000000000000000000000..714c80f77515a94dcc6edc3d12324ff769d768fa GIT binary patch literal 2312 zcmaJ@dpuNm8=tq`E-xiwF-nagqUJsthG{;UGqWy@qzP{d$IKZsF&A?VGj8<~8x6@? zrR=6CsVSvWE|py&UeVPhAylSF7iCv;*%_Pm{p0ODpU*kJ%jfxipYQWL-#<=uC4?knLsAvbP+f>PKtmkoD{a5 zVE`bQuMo=-u}q55GlJo=7=(eMUBd_}P);D>iTaXe0=eA(A1aZ2 ziG~q>=x@FMlNjd3$svM21j}L+eBI!Lw)#|ZI!gh8h)ltg$)aYu=qHjPGFT*&V_2-| zu3=ViLB3e3zjT~Nak+FaDU5(pKI8>3usR;RSS+BkT`6o1iQ~#50&EhA?dn41a99A* zg-oWhS!*f887v^<$4DS4GJ_TTjrI5{R&NN2T$dSu6yjJ&z){E~nCZgl;;(C=eUnGbYckl@&4DiXRdS}(r>?*S9kbge@LqHyh3O0+(E1LDAep&FTjJR>OK{? zH7a+L<@SzG4<(}=dAHB~W;yyaXs?avSIbIcd?l$dy%8`izJ0{ra`0gm$COJ2{#i?# z^CDGc^LlMD#r`A5)Yu#(ca)b)p;J@h+Kc>=>ew~fSFOm0*>wf(Bi-=TKU}qpn^RY{ zn$760oo+-%d4VdkYwZQ&is7J4OS?7`<|3x?GjAh}ld++8DkCY?P$|r#Mwm%2ga$tc2*l4%ELcJ=$Sv*1~m!7sFvP2XB>vpU+y+}xqJ(n)P!fo9v0 zJ`KRagZ8=Xbs7A$nx)ps6-4xcdD-0lu{@7GaJv;wsPz}UInD8bZO_?_E}I92iOkw# zS7ydvd5^n}O${wg5?_C5+%o3WXg&Ov?tZz-I{BhGP+3#k7P_zgj-&F}T`^dZFNYHi zzS&uPHa~0LMCak=M~(Ho`MGxuZrJn7f>-8Xx0}0}&!rqJB$rihuF5^|cojb6#dRKU zKxPE+qYu5op-n(_PmUblSihwFaO>g+{m4B`{jG)BnNM~lro0-ShzKlq?|tp*(3bcP z7jDMmRxDUB?pt5NzcWx`#LTvVgYA08RRXJGzDeBg;^Bc#W-YGSil*HbM?7<^*X{!nr8>HQS{S>y0XxfUOJB&U}v`{!(IvpG9 z#b&#y1I$mF*`GJt#nE`Y?T)$pcC2rfKgi`SO?=g1=oziOS3JKq*@kB2QxbR_^Lt*) z_N)>E6N7DOJ8(ux?>WC!E>hb#)6^fP4mAu}2a`BC;)-r>HuMXo%#p^&=W$|fc2XRe zMccS7js7RhZc?+*OLv~#_cR7c9r`}Q<_=@;d9O`aY+Xf4}P>T&T0&5Hd~QV>ApVq zM!OSoZuLCRt0NV(l5cps8>w4=2;I)y zm3zFc?*6^>hNz2+qWw}QW#Pg9IHGcaA0+RaMX4Hj)jV*wYih!GqT}6JV&UVWb41Hg zMO*S8dop$jmYW_6;QeRa>W#Z6QZO&lnpSXO5AORNAF74-of7b~)%(`nwgcQ(6?qTs`S@Um z_2$_9sFCr5C3)xi)xv&x*M<>AT}b5qQlTI!R&8hY?4l%c?&iP*Qe%}x{N&-zkvAC& z7cuiB>gb{3(gy3~0P0w#X>;(zaV2Wwmeid`i>fn9K+taW#VNmFJ{uct$hhM1&T+`> z{%OJ`T$_n)eQwox;Na7^YnGSSI4w>V8B0#LibSQ?Zprfv3kDhvTU(C=3mCPk6U(k7 zvBAz5^Q^ey+?u>M-Wz)2pEj7hIzZTR#iI6-{>SU%&Yo zcQ7-aG_^Os+OW=X99=v7=uqD;W1-!#PcC0@y;m-3^9jDR`<=JZC(|%gT;f8vy5|QB P_5UVbY+s;kZCJ{m72(ZC literal 0 HcmV?d00001 From eef64e47b5697d868da58928e26f22252d272032 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Aug 2019 15:14:22 +0300 Subject: [PATCH 260/290] optimize ERC721 inventory query Inventory tab for ERC721 doesn't load any token transfers because query is timing out. Looking into the query, it does a couple of unnessary joins: 1. with `transactions` for `block_number`. But token_transfers already have block_number 2. with `tokens` to check if `token_transfers` are for ERC-721 token. But the query is only executed only for ERC 721 tokens One more issue that I found is that the query uses distinct by `token_id`. But we don't have any indexes on `token_id`. So this PR adds index on `token_id`. --- apps/explorer/lib/explorer/chain/token_transfer.ex | 8 ++------ ...0190827120224_add_index_on_token_transfer_token_id.exs | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 apps/explorer/priv/repo/migrations/20190827120224_add_index_on_token_transfer_token_id.exs diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex index 2aa291cb6f..4723be2fcb 100644 --- a/apps/explorer/lib/explorer/chain/token_transfer.ex +++ b/apps/explorer/lib/explorer/chain/token_transfer.ex @@ -238,12 +238,8 @@ defmodule Explorer.Chain.TokenTransfer do def address_to_unique_tokens(contract_address_hash) do from( tt in TokenTransfer, - join: t in Token, - on: tt.token_contract_address_hash == t.contract_address_hash, - join: ts in Transaction, - on: tt.transaction_hash == ts.hash, - where: t.contract_address_hash == ^contract_address_hash and t.type == "ERC-721", - order_by: [desc: ts.block_number], + where: tt.token_contract_address_hash == ^contract_address_hash, + order_by: [desc: tt.block_number], distinct: tt.token_id, preload: [:to_address], select: tt diff --git a/apps/explorer/priv/repo/migrations/20190827120224_add_index_on_token_transfer_token_id.exs b/apps/explorer/priv/repo/migrations/20190827120224_add_index_on_token_transfer_token_id.exs new file mode 100644 index 0000000000..b92f216fd4 --- /dev/null +++ b/apps/explorer/priv/repo/migrations/20190827120224_add_index_on_token_transfer_token_id.exs @@ -0,0 +1,7 @@ +defmodule Explorer.Repo.Migrations.AddIndexOnTokenTransferTokenId do + use Ecto.Migration + + def change do + create_if_not_exists(index(:token_transfers, [:token_id])) + end +end From 48384f96c3524083523eaf87ba77d6edd63e8132 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Aug 2019 15:24:08 +0300 Subject: [PATCH 261/290] remove `Token` alias --- apps/explorer/lib/explorer/chain/token_transfer.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/lib/explorer/chain/token_transfer.ex b/apps/explorer/lib/explorer/chain/token_transfer.ex index 4723be2fcb..619de87db2 100644 --- a/apps/explorer/lib/explorer/chain/token_transfer.ex +++ b/apps/explorer/lib/explorer/chain/token_transfer.ex @@ -27,7 +27,7 @@ defmodule Explorer.Chain.TokenTransfer do import Ecto.Changeset import Ecto.Query, only: [from: 2, limit: 2, where: 3] - alias Explorer.Chain.{Address, Hash, Token, TokenTransfer, Transaction} + alias Explorer.Chain.{Address, Hash, TokenTransfer, Transaction} alias Explorer.{PagingOptions, Repo} @default_paging_options %PagingOptions{page_size: 50} From 1494d2673858cc6a4b83eeca5dbe36fba9049d9e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Aug 2019 15:44:07 +0300 Subject: [PATCH 262/290] remove unnecessary test --- .../explorer/chain/token_transfer_test.exs | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/apps/explorer/test/explorer/chain/token_transfer_test.exs b/apps/explorer/test/explorer/chain/token_transfer_test.exs index 5d9608e66b..b388fafcbe 100644 --- a/apps/explorer/test/explorer/chain/token_transfer_test.exs +++ b/apps/explorer/test/explorer/chain/token_transfer_test.exs @@ -188,31 +188,6 @@ defmodule Explorer.Chain.TokenTransferTest do assert Enum.map(results, & &1.token_id) == [last_owner.token_id] assert Enum.map(results, & &1.to_address_hash) == [last_owner.to_address_hash] end - - test "won't return tokens that aren't uniques" do - token_contract_address = insert(:contract_address) - token = insert(:token, contract_address: token_contract_address, type: "ERC-20") - - transaction = - :transaction - |> insert() - |> with_block(insert(:block, number: 1)) - - insert( - :token_transfer, - to_address: build(:address), - transaction: transaction, - token_contract_address: token_contract_address, - token: token - ) - - results = - token_contract_address.hash - |> TokenTransfer.address_to_unique_tokens() - |> Repo.all() - - assert results == [] - end end describe "where_any_address_fields_match/3" do From 65f07aa6381c9eba34a5e1039d5a50c2cf204ec9 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Aug 2019 15:45:50 +0300 Subject: [PATCH 263/290] add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8335319cb..919d945c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2635](https://github.com/poanetwork/blockscout/pull/2635) - optimize ERC721 inventory query - [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint - [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper - [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css From 69ed2d63bf106a06010e08e4e16b69d79fb69b23 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Aug 2019 17:11:15 +0300 Subject: [PATCH 264/290] fix gettext --- apps/block_scout_web/priv/gettext/default.pot | 6 +++--- apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 520dc1d1ed..607d83da8a 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1151,14 +1151,14 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:9 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 msgid "Verify the contract " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:9 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 msgid "here" @@ -1314,7 +1314,7 @@ msgid "To have guaranteed accuracy, use the link above to verify the contract's msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:7 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:6 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." 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 1626e8b6a7..a4ae226813 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 @@ -1151,14 +1151,14 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:9 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 msgid "Verify the contract " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:9 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:11 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:9 msgid "here" @@ -1315,7 +1315,7 @@ msgid "To have guaranteed accuracy, use the link above to verify the contract's msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:7 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:6 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:8 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:6 msgid "To see accurate decoded input data, the contract must be verified." From 6cffd23ddc8ba98e8dbd5cc139e6bed26eb7cd13 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Tue, 27 Aug 2019 17:26:00 +0200 Subject: [PATCH 265/290] Added [#2626] - Fixing 2 Mobile UI Issues --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd79f9fdc3..9db8292a28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues - [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test - [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta - [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint From ec2a3dbdbdd1b85b9d72dae196bf35f5181530a7 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 10:09:51 +0300 Subject: [PATCH 266/290] limit to one candidate --- apps/block_scout_web/assets/package-lock.json | 11 ++++------- apps/explorer/lib/explorer/chain/log.ex | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 2c78f45f55..1565a96a74 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4555,7 +4555,6 @@ "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4773,8 +4772,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": false, - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "optional": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "safer-buffer": { "version": "2.1.2", @@ -4877,8 +4875,7 @@ "yallist": { "version": "3.0.2", "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "optional": true + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" } } }, @@ -5989,7 +5986,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -6191,7 +6188,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 0c9b2087ce..7916b56fb3 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -155,6 +155,7 @@ defmodule Explorer.Chain.Log do [] end end) + |> Enum.take(1) {:error, :contract_not_verified, candidates} end From 34aeeaddcb78f38d565297ab08949d738a3edb73 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 28 Aug 2019 12:24:30 +0300 Subject: [PATCH 267/290] svg images for network images --- CHANGELOG.md | 1 + .../assets/css/_images-preload.scss | 24 ++++++------- .../css/components/_network-selector.scss | 24 ++++++------- apps/block_scout_web/assets/package-lock.json | 11 +++--- .../network-selector-icons/aerum-mainnet.png | Bin 4225 -> 0 bytes .../callisto-mainnet.png | Bin 2871 -> 0 bytes .../callisto-mainnet.svg | 5 +++ .../network-selector-icons/callisto.svg | 7 ---- .../images/network-selector-icons/core.svg | 4 --- .../images/network-selector-icons/dai.svg | 33 ------------------ .../ethereum-classic.png | Bin 2965 -> 0 bytes .../ethereum-classic.svg | 4 +++ .../ethereum-mainnet.png | Bin 3634 -> 0 bytes .../ethereum-mainnet.svg | 9 +++++ .../network-selector-icons/goerli-testnet.png | Bin 2951 -> 0 bytes .../network-selector-icons/goerli-testnet.svg | 4 +++ .../network-selector-icons/kovan-testnet.png | Bin 2846 -> 0 bytes .../network-selector-icons/kovan-testnet.svg | 4 +++ .../lukso-l14-testnet.png | Bin 2312 -> 0 bytes .../lukso-l14-testnet.svg | 6 ++++ .../network-selector-icons/poa-core.png | Bin 1639 -> 0 bytes .../network-selector-icons/poa-core.svg | 4 +++ .../network-selector-icons/poa-sokol.png | Bin 1714 -> 0 bytes .../network-selector-icons/poa-sokol.svg | 4 +++ .../rinkeby-testnet.png | Bin 2171 -> 0 bytes .../rinkeby-testnet.svg | 4 +++ .../images/network-selector-icons/rinkeby.svg | 15 -------- .../ropsten-testnet.png | Bin 2409 -> 0 bytes .../ropsten-testnet.svg | 4 +++ .../images/network-selector-icons/ropsten.svg | 4 --- .../network-selector-icons/rsk-mainnet.png | Bin 3811 -> 0 bytes .../network-selector-icons/rsk-mainnet.svg | 4 +++ .../images/network-selector-icons/sokol.svg | 4 --- .../network-selector-icons/xdai-chain.png | Bin 2810 -> 0 bytes .../network-selector-icons/xdai-chain.svg | 4 +++ 35 files changed, 85 insertions(+), 98 deletions(-) delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/core.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg delete mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.svg delete mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg delete mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg delete mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg delete mode 100755 apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg delete mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png create mode 100644 apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9902cc4398..7850a7f551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons - [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test - [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta - [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint diff --git a/apps/block_scout_web/assets/css/_images-preload.scss b/apps/block_scout_web/assets/css/_images-preload.scss index a084daa7a9..95f4633a56 100644 --- a/apps/block_scout_web/assets/css/_images-preload.scss +++ b/apps/block_scout_web/assets/css/_images-preload.scss @@ -1,16 +1,16 @@ body:after { position:absolute; width:0; height:0; overflow:hidden; z-index:-1; content: - url(/images/network-selector-icons/callisto-mainnet.png) - url(/images/network-selector-icons/ethereum-mainnet.png) - url(/images/network-selector-icons/ethereum-classic.png) - url(/images/network-selector-icons/goerli-testnet.png) - url(/images/network-selector-icons/kovan-testnet.png) - url(/images/network-selector-icons/poa-core.png) - url(/images/network-selector-icons/poa-sokol.png) - url(/images/network-selector-icons/rinkeby-testnet.png) - url(/images/network-selector-icons/rsk-mainnet.png) - url(/images/network-selector-icons/ropsten-testnet.png) - url(/images/network-selector-icons/xdai-chain.png) - url(/images/network-selector-icons/lukso-l14-testnet.png) + url(/images/network-selector-icons/callisto-mainnet.svg) + url(/images/network-selector-icons/ethereum-mainnet.svg) + url(/images/network-selector-icons/ethereum-classic.svg) + url(/images/network-selector-icons/goerli-testnet.svg) + url(/images/network-selector-icons/kovan-testnet.svg) + url(/images/network-selector-icons/poa-core.svg) + url(/images/network-selector-icons/poa-sokol.svg) + url(/images/network-selector-icons/rinkeby-testnet.svg) + url(/images/network-selector-icons/rsk-mainnet.svg) + url(/images/network-selector-icons/ropsten-testnet.svg) + url(/images/network-selector-icons/xdai-chain.svg) + url(/images/network-selector-icons/lukso-l14-testnet.svg) }; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_network-selector.scss b/apps/block_scout_web/assets/css/components/_network-selector.scss index e4a4991fa7..9df2d22164 100644 --- a/apps/block_scout_web/assets/css/components/_network-selector.scss +++ b/apps/block_scout_web/assets/css/components/_network-selector.scss @@ -245,40 +245,40 @@ $network-selector-item-icon-dimensions: 30px !default; width: $network-selector-item-icon-dimensions; &-callisto-mainnet { - background-image: url(/images/network-selector-icons/callisto-mainnet.png) + background-image: url(/images/network-selector-icons/callisto-mainnet.svg) } &-ethereum-mainnet { - background-image: url(/images/network-selector-icons/ethereum-mainnet.png) + background-image: url(/images/network-selector-icons/ethereum-mainnet.svg) } &-ethereum-classic { - background-image: url(/images/network-selector-icons/ethereum-classic.png) + background-image: url(/images/network-selector-icons/ethereum-classic.svg) } &-goerli-testnet { - background-image: url(/images/network-selector-icons/goerli-testnet.png) + background-image: url(/images/network-selector-icons/goerli-testnet.svg) } &-kovan-testnet { - background-image: url(/images/network-selector-icons/kovan-testnet.png) + background-image: url(/images/network-selector-icons/kovan-testnet.svg) } &-poa-core { - background-image: url(/images/network-selector-icons/poa-core.png) + background-image: url(/images/network-selector-icons/poa-core.svg) } &-poa-sokol { - background-image: url(/images/network-selector-icons/poa-sokol.png) + background-image: url(/images/network-selector-icons/poa-sokol.svg) } &-rinkeby-testnet { - background-image: url(/images/network-selector-icons/rinkeby-testnet.png) + background-image: url(/images/network-selector-icons/rinkeby-testnet.svg) } &-rsk-mainnet { - background-image: url(/images/network-selector-icons/rsk-mainnet.png) + background-image: url(/images/network-selector-icons/rsk-mainnet.svg) } &-ropsten-testnet { - background-image: url(/images/network-selector-icons/ropsten-testnet.png) + background-image: url(/images/network-selector-icons/ropsten-testnet.svg) } &-xdai-chain { - background-image: url(/images/network-selector-icons/xdai-chain.png) + background-image: url(/images/network-selector-icons/xdai-chain.svg) } &-lukso-l14-testnet { - background-image: url(/images/network-selector-icons/lukso-l14-testnet.png) + background-image: url(/images/network-selector-icons/lukso-l14-testnet.svg) } } diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 2c78f45f55..1565a96a74 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4555,7 +4555,6 @@ "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4773,8 +4772,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": false, - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "optional": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "safer-buffer": { "version": "2.1.2", @@ -4877,8 +4875,7 @@ "yallist": { "version": "3.0.2", "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "optional": true + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" } } }, @@ -5989,7 +5986,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -6191,7 +6188,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png deleted file mode 100644 index cdef9a2edb814eeebcb9317e0fae60b4a858f6ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4225 zcmaJ_c{r47{~v3XP?T(G>?+Jy#xj=3I`)0v$IKYa(ijZk5Lt>GTSP*R64^yYmdctn zjX3s6q3m0By`1-S-rw)K-rncBp6CAF_x1gJzMt>%&;7)ko9eT%@UZ{@05+I`j^**{ zc=9qa9)FdKv}lhPUZSo&(F%to26+$=04*<^Cjtn=c%TrL2oJB|8(j!B0Dw*sZEa7q zH!+67aTpno6CW8827inO0MxFL@E&kq1QFlpVCcq$w9zYVt59<#lsSE$b3q7_^jzPk}zg&pE>camP zWp82*)W#7IK!}W@G+b5z0#s6wkyVseP*ITr%7JB-L11N&th}_WB2)nkm6HSh{RkgN zBX}X9mO6TW$2#7r3wslZcqj-I6ci*ABrk&_pg^)JDk>nb97s-1`q)F-KNw5&AW38W zMSe2qApGG3G@gjYVSy)%9-g=WqPp<0(toFb!T&>x_5Zs}#{~nCJn$e{8SqI;KOId> z{GdE32z=U0GX6MP6P}7or7GQdZIWiPgcu1270I@h8^nKUm#gVowGFgFlX}gCL*- z5ng%(90vGT;!yOjwOs!t-``lTUu!uQ|BF08$6`Py?fpOP{&{pfLnr1x!+X5>XZ#V^ zOAq6wA@2t&`Un*> z71pe&B5BAA_Y?O-zU|R#a?+4}VLxaoRz;^R^tThf6g<*w9E5dRP~XRoiBjN2DKY~5 z+=4loYsv?X7liy-nUk>nJbx4{x7aBK$(Qaj%xg2tu>l8}T74Kit6?ph`;k=}_+eLW zp+FgW+@1sLphoCHL4{j{#&lz5`8g#6ZESSs>bV;iA^iB<)Y-tCQ1Hd4nu>q%ulyISgnQiswa6fRegU}lp-Bm7!w9k>@K;JdH z?0s7AaM!k?$Rc7IKcv%JdAv&MW--5Su20ILQ#OY|^Hv;%~Ny5Ae{jL z$?)MAn20-T*m%|D8C8KIHMlv7)+fzkWBt3mVoOJ8uT*y4Xx$G6Sdwc)_}-;k1uk^l z)L8<>lY6z9+PL0IlgFq*mrbXhCYVq!HCyO>C1$J9`ZmbH{7929U}hpnzN>gv?=AhH z49lNd$YL)P*|Kuqd&`>(oN^~9BUbZ`*817%%J%-p>`CIBi);#^$$Fh{hCXo9pIOg& zxoZmFX8L5X_3rRgIcsBc$bCzN&4Ay(glnP?61yUOUvSBLbs{CB&m9H{XkbJa&aUrE z88>0=J=}c1l`njEE5Wee+9V{k{{bqDfR)hrlIUoau0>~ai@Lg<@qYY12ixUb>G!6m zR{}X}J3X6@-;tsoc?|e`Y8KY4CUyGvk^@LL>!2EF z+*%=$g94J{g!?M8b7bPO2~EX^XI>`WzBLs=iGL=~s3OUh@=BvwLUW_F{b^)v!K2un zyb%BIs)AHUu%4Y~PqFDDJ#$eA5so#S9S8L_<|G>QH?b<^ethk*kyZt>Q=aR=QEFEj z_%;pHe~%t}i%Xq&F3PW9hDGHyMepE6%Y~mykGH*xLnw$`W_oaxIl^l=I!P|>P%?fn z@jLoP8h>ek{v1ZkcAs{xmt)S!R0W-C`(gnBWOnmGn5m6+(e@fuWmv4_>(%B2iX!nhCOLzEoEVJ}vD9{6*dBT6mRh{e|8Zb1i$e=r7eHdQ85`5wP;H)^ujMR{aZrdg zeD=lqUCS`FE)xPhMu3zP+>U6-X&iO zkuotrb>?r@yl8Z7@9Jq0HRQD$^99B;BCwT7<*LwJi>M#susM8aPlBWN+N<(om z*ql;}9P&*GN;BTQvQik^E;v zhIXiPu#69?MEz1?AIqQO>mF92e$VVuM4#Nwx?h&lv%>Wd-eUSBF~C^?l@;cwo3>oy z$i9}`EnQ@zu3r4{LzLmTlc0Y3V?mu#ReN?qxvhk|(WBDt!z&1G*BLAAAufOY&^ZOC zi|t&=e)1k|7O%bS^P4*PM2M>+dLSK|s z&aN1l)hlOu)+We4ig{F#y7-}-PpUqxmon!PUy-ZA2?&p8P!N!FyVCu%bkr%Qe3DEQ+#s~+;;%f)xZkn`ZGt!V|4k=TaC-WNX?=gsqmQt#us z3g6v9H$QLHvtGEl8WxmS>(u^;F{SO3SPt4R$#S5#HWxO+yuAHpT?_Sk+L5J+Jkj0D zu3s>*#OKo*q`{fNverfoJ=gE|@TM=e!)UF@f~!Q&b9ScNiKoyhOf~Q~SmtJ8o74>G z530!0JbxZD@~HhZzp>-jsMVgER0q6pVMUgFXwOD!#yC5fk3p)9l%81-nU&!H7L{n6 zeklb9c4MQPk<$WLuHxmVzlATRx74s&$>c_?!o<0(!}iXH68q^$Pan>%SNGk?%8}O` z9$mJmN)j8esAeVvE#0mv9n*TJ%-)bX;;g0h@(J~R-P1mYOH9Fa-e*c5=h@wUU5B#o z`U;+nF{+R&h~?Nyrh9REC(!zJ)-`FJy1Ho>^Fh2*<#|g+d#gcx6gej37PST5>N#nW z$rvV1)aga?Y|bRDE|k}4C8}Q7xvt_>n<}elpQM9w6z&VltnuLigNlV-J`MbV+PGBG zc6bnl&9^7zrFq))oyxvQdd_w=p5kowfPV!L(v)^@tV*Lze&|cP*d6*ig1KC}H{vo3kRO~f1-e&XNGw+#L`9#|W@ad0d?LFB;S#N- zwrrhofcDJnPHI|BhndyRJ+TmLBTuc&1suL5*>5Gk?3;Y05u!vJ%9L-(&fUmY*pVqH zrzg}l&FP8#s<1Yt6y4!#fx+n{j;Ca0aVF?cRFVxo?};X`2y*4sH)4tRC&IAG^9^_I zur^;z$aSb8AE8ILvS$X#C}@+SCLg)k!%zpvT{U5$Ic|CYL{UG-yQi{S1l~i}eOy`1qIN7J!sD-hRKPUyS)v541tu)tK)LWS(W6q|qHGzz zKNvWR9~sC_{|;0d6OStw7~+h6MVC5tYp}{ zMwj~DZS3;7wSLa{&_4AkPo81Eb}5|FD6P)R<>I1H+$-SVTyv!)_p1Ck7WKPhW=qq1 z7+T_3yZ)D*I<9g5Gjdyc6$p^bWyh~;FZVq@-DFm;SBqSz`yO9hz~5dy*T}SMLtm_< zxYxCYD5xVl^P*q7uZk%j7@3aJl`;)nrYJ1PpU_Evr z$!4H3QdQT&U5AQ~#yq$aUm^d&U4Xb_@bD>7DxwdM0K}Yjy|K!>l%dKSPCwt*GE1e~ ziM!MS(PPexTdS~;&Z8)Q3^^x>*Rw2`!Nw4P-y)*F$fANDkR(+F^)N(^_9? y8jIRHGHASf_J`elri;J2O@L|08KXZKcmVrK!v=l99jhll1z@_SI%U`0Z~Y6TXpFu9 diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png deleted file mode 100644 index 2e9f2b2730b309d9df7f0216700bebf5a638ac26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2871 zcmbVO2~<;88cxD0h`6F?fiw;(l`JnLA$cSSSrDpWGs-qvUXlk%N%CS|fPh$tOWluJ z2kL@pI#QRSxFQu)GA`g$mRKD{aE8br&_O^H$K`;|3tQ_Po#UBz&b#j}-~ZkJ`|p4M z^R~oBFZOVo?S{kQJfb3n@z^)n{<=D2E&FIV0sBnQMkb*+oclEUi^uIRo`u6XJyl8) z^@-x8pbSw{AUPt1DF(F`L*sDVMFuS-%YgMnDV(m<@JM}C)g+=)&Lbr-#Wb;204tP{ zxjJ}RZnQ*}n<3-KNsB^>Tmy&^s9`-sG^kY?6g2Qi!@MBYw@*_^#9@d&gGUOtZ%9lO z#}WmI4kj`wEV2w>Fp0q&3cw0ta5#ZPIt^e`X>2MGL${kEGD+wIG$6ot;g|4x%8sbSl8%aHupol};yP2r`9jDcxqhZ1VMm0cMDnOyxC5-{a;{Od*tH;r(J|6zf-}e%u zk{m5ejfYVrQzwHl_}sCrP`xM%b8%GcM;ME;V2ysAq>3&fC2sj*WB*j0^M z!9qw6^GJ3CnZ_j3gC%qTWY9r6K&AzOG};JMjL4N~Iq!oqF;MV3P%P=>kRJLNuviR6 zX;3|+k-`NSxZfCX?^ zEHa$}*sll{2D>m=r_6%o5jsRo98O(O`JPa57&JyOEm-tnsUx=X4~L2ML0js$Gm%OZ z%dec#3a|`bJ=#+#G2gJ80YWnSZN>yan9roq$@e+@ac4V1nyr8_%6C)qoqQXCp-7rO z8`8ny=~y0oWd4s>$`p_$9mYy5m1NgSwHKoianzAR_)Yil+V2Y27#ypH_U?EY#s=es z9M)jeI;>0|&ZFJL;T*f8gy9lHb5F5)v)A(JwfVi8@|wzD&ZLyU(gRZJSCN6j%@(&U ze}0{6-Q>2=oquKWYunVKTl`dNNnyG7t!=wSlEj+NzV@Eulz|lS6=_TM9XrwUBYYvo z4;0*nJ92uty)Pfv4SEh%*VXNN^u}}_ZRB+}#C}$|>z8kduIIv*5Xe>n*%fQQ33ERe z=DrSV|A5U{10GC|cIYLToO@jk?*?wVb#1gzQYXK3GPv*cw_f$koxFepx^kV1v4Kma zB%;Om$}-CsJyUOfZebD*hIUP*;f@myyXh;<4n24;eEM+jISw^0a|Bmf{cTj6N9y6Q zBkrIz)V4c$;~tW6(ty9VWlOZnHdoLJrm|wG*23_&_`tJ+uU6UM)NLnbZ{nuryDXj3 z^|QGZ|1bVOITIB4d4zioOD5(OzkOk8-}Tnfrn5XXd=E})_YJvx z_sZ5Vheh)e@u71bR@d8{|6PDy_Dk&L_HT3?Dx1b?Q-P-u>VJ~A-LA~V@^Y@YF7ddyn?=~io@;qBM%xqGHbnKbx>%5B4 zKy~X%;F*p)r;0Wp2@Be{J5`q6_)E5fPt=NiNlurppn12Amv?>Pr(NAOSYLEWQq}cp z`cG446((3+3Q~;y7M~UCO>=^3e)zQ7MNr#P5JT!+d&AV^U^=xk+4I>q+|FA=(YM|< zZwAg2ViNQF2dw>~DKEIv3ps~|g7ZwaU;lwDYQHZ!nyDICdbQznS!H*%yCR$4*s$SY zyZg<}5uM%xttMsb55Sv{f@j4UC(i`VS9%OO*nZ|F^cCe4_(N@xGpYv-wdmV*P7Zt#hs1WpZQ4^{fWHr zSDWd0fp0)o+`j#h9G@wQ{L-_<7xzCoonRj7(R6o7rX8v}LwFrm8pmB0u`+9AmCL!@ zl)cC4t%VkMix^0%&1`79k+7KDt*DpfR$Ox!a4PDqyxiI(ou>*?mulm0_$3#fqU_8W z0B+_iyzkh;@>*VaU{?+%QEaSMd3Eld+8W6X%p4fZmTinwF5`)91rRMxo?2x(|*;8}z?xB#mx(5rY>H=JQoGB9zBB!Gk2H3s}JQ6y$&!=c6@4SwQ zM;5;feKbf*NbzZ|027z<{2S}<|5Vo&E99=NKda7Mf17tN%VAC1%xmqI?&6MKhOL6W zqv?8s@J9~@;L+^6GjGi?w4V5cdvzdmY25h@nKh61`1U=%)m`oft-r46xwPceUsuzg zEU)AF>dMp=f4nHFih6tU-obuGGr#2TZo-`jUGlzxK>iHhfs?F<^{4%x&rSg*84hQp z9BlqN?1;I%sAI>}E`1ns8b+thw{CUJJt_W5U9M=Hjvx5${L=&B9^^iAuutQeB=f@V z^fzmL$}&szS + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg deleted file mode 100644 index 7adabb6538..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg deleted file mode 100644 index 63c66a6baa..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg deleted file mode 100644 index c4f800733e..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png deleted file mode 100755 index 5ca5d8fe7bbbe31f48a59dd2f908d48c7f723654..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2965 zcmbVO2~-nV7NuQT6~q>h03j$UlBE(Li!2=y0zm^Y24w`4B2@{2Bo&fCg3f3QgONd_ z4Y&htalsasc5Ig(RFD=_gvO;2Sw=u{8O0G16bGCNOWK*%IiATmm8$yx-uvHu|NVC= zmmd{wXFb!}!otFi8^IQ!_vNO`avb`9_WG|e=*>zQ@dveqg^i=>`pRNgk+X%x#2%?I zRujux#1J8J0tg{VFhM6*qG$_?z!04h6s5u%Y!WPyDuQq?f4YRjN}(X!GJhV4r)0s& z(uh?mc*&|Lp=edAhz{XGg0X=*1}Y$jH6T_emnqZ?T@Y?qmw`T;hKV@rFhr9Ygkzc( z#K!XYSQes!vHpYrya@2~$5QD8Ab{dWr~6{bB!EUF(TD&A4+Jp$NDML=JNm<+tEnI{ zL%`;Yu7$n@;gU5PC4)%RYPAF{g@C9eM1W4G6G>zunT$sfcy*>i1M2V!wbz&e8&-={ zQl&~>{SfMe~A(5G@OjpT<(*%i#und-? zFg5B5FvqD(Ml^^z8Tm{S%+uynC>bmj3~CUS5J6;PyUZU`!LnGUUG>M#<$)rp!X!P< zafa=6iVVqsBD` zN4ufv(cFg77jq+r6{xfdZPQOnQoGRZ&*ie2Lf!oryKf+_G1K+oTXCM#EZNeCq9eJO z!}~g7tnJ3-{52D+n`iv6>(o6- z7dl`(#Y|g-l%;S2le<>c#ue@jn-wMU>Tu4DzinH7w-&S5cdl@G*_HSA>A9(>a_?eg(Z!yx92&$q z+&Y8d@!!vdritbp7Q47nK6KJrg6_ZB?C72Hd}B_l!9L@{M#_!E^{497;@^TdOL)Q^ zzI`9I;_V#K_!{V`RX`ubaJH@dxXbGo;$Q6wa(>{lc~qN>n#A=0VW_I1X+gt9yR3tP z9r4G0tU8yB=R|s*{z6SlxioI49Py z>tFK0Tl*^^UDvv1$0+cZ{h^0gIkw$H6%AhpHvVzygd5#$vjScZULPVjCwAQ@b}Dk; zj<2qYUa8WzlDNVBlD^!&?* z0|nSKuQ$_HP4f02lCuuAHa*O1LT*piRy#Xsw{g94_Uh9%ekf{Kl#pZP7W}HigF0V6 z5FJ0WIo`-G4a~DK7_v&ep2T1r8$%B0wMR)(@>4IH6PqqAo7B=*!6L;I8h*Vs#er$f zgd84EYr72mv+|fYwh2EJ^KHn=cq^pL5FXN)ac|=+Z8qPn;(A)G%vbQdCA{>;IetFs z#ZqAD6Fx&aKfY!>?dqEJ%BqV6gFm;NZf>a;&fbvG*>&f|!HR8KWSo0`=7&|OPAX%qM6a>+jC+Cw{v2fY2?Mj8d{Q0FIIBfrTlytdp^?X~n0 z%}|a3PeFQaQ}iAh@d?L1r36=x@m2R5R{cs{wfgZ6s&-TG{wMLx_4 zKb|f)n?Jt#v3rs;BUo=^h}n1KU~yg8KOCwH-5-ZKu%&+W!%pHmKYlP~YyDqb-=FRfzkBkx jy1d_Ys^PZPezPY;E3DeKetXFT(}y!REQ) + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png deleted file mode 100755 index 3752a925440ad10ab87f768adee9240b3ba9395d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3634 zcmbVP2~<@rq<~EU|3!wjzxA)KpS51@d-v|M@7d>`bJlwYygXdA z)Q!|(FqoE`E5ipG{pFXc0`&hw)4zP7K~3zsRRV))=*X`{u#?#aFqqOC9?MVa$8@J~ zL;?#oR}=_X$OK{t4TIS_$i!?;C?G`!0>M0?9ct`)Eegrw+M%{sF|kZB9SGsMMuWhn zXb%=AI+R1^q8#jzwlWGtAONInq)fmUN+>cr)Ms7_bT6OAppc&-(oj1TRlXt8kLiV^ zi$DNrWkE!9aF$j`YqAB7NU$W6*CX**90`LZVQ>UAj!3b@Qt)`>+z$oq26BTaJ`Cr% zy`U#MRESh6reH9Uk&zaW1Pc)ujKPt~WDFLM!Q;^o0xgLWO4%~BP_lZSfdNQ3AWtmi ziG)ZwBRfzOF115Jp3X`Th!<#ulDRNJ0mI1HVhqj#E0;76WHSFZR3KPDOQb%)@BaQR zv4j;R1~5K=L=+Bk00_Q%ek+O8DFSkFPV7H0c8UOm(gkxaXTeq+4)Q;TiOazNd_Vxf zB#dZGR2BO!C}!@0tJhmg)&84UQpCupm-d`3QNIS{s{^t z9hWU-{}V8iNpTZOq--GvaAVk^Ag3&NJT8S}1>m?G0vpZY5OHWr0*;Gj2L%z)mShf* z%*9%9EQ#FDenIvO5hq+8!+CoyWRJrUX$&kKXGtbl<8V%7G8RX0A~CF~)>JBl-SK&lZ%}1W*c^E^LxR|lY{zjOGXo$V}XWC#FJ z{vkF0JKttu5>b#ek_`gXU?>m1l>g*E=l`rFCxk5w2A~#;LCLjZ9u9Rw`Rzg*h8`9gIUt0nL8wg!Twmq~gQ@)N#-Orfy`$NmJU0a!+-o*q4aJJa z6;PG&@d5r=2{zN6STv12%iXBAjFbOp166SYuQ>tqT}pZVEe}f|c-%=ZSznR1G_Ee{ zz(M`j4e?<6Z-Gz2Aav3416w@>pKg-L^_^$NJ`GQOuy2bgzHt1Up_LxhQLK$nRH>)_ zWfhO;)SCD7g-Tz*9& zfu|2XsrjUo=)`PA4;vb;*DF1L^CD#L!opkj_F%-ys*)mqoqLyR zC+SA5=(3Rp)Bb)JXXP-`xSCqsb1_LuS>e~UH%_}FPwcqDO<_^<{o&~k6Y%80*N5L# zyqVD&apoX0m0#VAjdit#CoG1qYtq?&xBjCt2XX4z;8)tg`ue`xbI$h1TXn5F>f2rM zQMqa@JiyjIR|hc-KEa7?W2gNB{21lf)YZ7P2Wr3qT5)9@BGWnj#`pf4uPDL;%EQ7| zUB7C(_hZ+OVFA~PComRy0UR}ic1muo!)`)M1J2rd3oGCZEn;u$GXcpAb$-*OfSTPu zkgjFqX1X?~6_hK&*F2tNvk?}Nv9V9!VQJ~zMbbPCHQQZZlMdacZY&5Y zVAmZ!dF&k#akNM|tomI%hrcJ_=yB0*!>f76_D@cZy4YAbNCEz1qvb0EdiRVyeT(_V z$xo=EEu>!*Qj%6jFWbJs_wniM?99x}*D0#|yv*D^k`OI1C8ebWcHI>uWtCyLy0)XF zlHS=~TzsMA*XRcpev2JtF)=YRnc}4#D-4$_p-<4*4V$*=Mf_xKWu~N{D|Tycs_iXb zyh`>kNy{Jt+@OBEdGhUB#iftP2)Jogp_jpHmc}#EyI$%dg&?)$5YgDfongD~{g^Y| z*r+uypmyMZ!DXz8QY7;An>TN^h3M+To{h^K35 z4L!#ul>!&#=da>|_-vX;&y%Cnv08yV1nV~4aeQhj+2R>dK=WIaJ~YBg?Y|m36J6yFFM4lbJ#_@VO3zb*ol87thF@+qt{b1Imi$s$bbQMmnr-C_QGIOR;?}r)=tXEC_hD9! zz_=d#^lr2)E2}Zf%yJV^^lPnHQBkqZ1*RbEeefXoK)CisKu>ptesm0-M$aEjICsv3 zTY*3vHS^ObD=Z8O47_Dp+EHA*w!mk2mGgpWVQ93$1U0hrQ7uMxu zcUb$s%u^1ZdhIv~7};#>$1+r2RpvDH^z@vv7WF1k{QdhfLwQRu+pnF=J%x-|rjyRO zw;rCL{E8)Y+({r18sfUkw*An*A!DUog%$#PC|h)MbmWzDhgGb7S*Mk?HRnP;o2{I6 z;+doLat}Ygv8m}yj$!Apba#~zW-_#jxcS^zZ%xsjxVu&L4j~xobM2JtMZx?4M4rK5 zyqQ;k*O~Z}A+_hbcYELMH_37jirM_JIdO;g&8rL_|5C3fwGJDOEUCN_@%S1Nu0lF* zShk2E6uvt0wP)JXxPSkc^YZ0OU!m|KKSJuBHUy9N(^jd9-m%qp`|3;R^%ft-yNdta zmW$c^(+Sr#Zzd;F`zO4U7Axkqty;NqhwjeK&XQ}CB^XT05K>ED;}UGEZTmqDb^Xn@ zU8>nWyq@lTPkFhcJ8$2{m6z|zZx2Z`H=j;x0$O{kR%);l;{(a$$!s#GFSH;It~E6D zA_I(9y{fCLXU-}azgrGdOUuYGcBo%Pz!R1lo%q#zBHHl-_$lJlPD+xVe;*vGn_?5% zBlA+ONkPYxRQ=Y?Ju=zITb@uXcHD(T=yygv!d<_&CS~7hsyl!Eu7tZL%c^NqG;;9J zFZDVPo1p6HZGtI}-3pp`zbEC^<@G6EMn*<~d8L}8w;tETWPD!(%W4c=p6Fy!Rwg)a z`nFjiW(pOVm#w0Dd)ZoborE+7id~r7BG@|hHoLyRJDu5JqX|p6vHFs4!<~le>g$~8 zu8Q;QG6U}`7Hbm9J@CnkO?|@hnxt(7#nnpXM=Holi)ej&`V4d?4qutLoxEgJTctNu zAH#?W+}$>u6I0n`*y)j;bblp&uffQhA@dJPi6fCKk`y$K2Ad5S+VA5ho&~Y(2b)Sv z4mEiv3$|SJciLulnT}w!C;D`2;|odsg^i{&Gczqyt(2le-l4`7np!I1LE1+srP3A( zNw31)Ft zA-vn$8%-7V)h(@Uqa~*K_$HsAnjAZMEUDVI;=V)b1DzGBD!nZ&nm>c8S#2GiIL{X^ zUR)8zUHFZ8|FCh~ao2MQ;bjw|pa?Cflxa60q1Z{z!s kBvtq~`~Nb$%$w0D+5X*&mCM%cm4DT_Ie9QH(sq6GA6;jw6aWAK diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg new file mode 100644 index 0000000000..cb0276593b --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png deleted file mode 100644 index 7a3ac4ae48681ce23628e25c247b0ed70dc23cac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2951 zcmV;23wZR2P)^@RCwC#T?tGT+Zq1xAt)juyr?RANMZeQE5GynYCo$=|=p#ymkYBOR$ofyAl zjAU%V7|Q9-Sf809%C+JHse*s|1!Swl!^Je`S_nPc4HjO7{}O^v96B) z=g%2pwJpZxJ0*_a@Vm!G}Px~yUnc}1Lpisu7ROKH)lM+*pO;2 zg1H6}MhX1|Kby_SL^FO>e<53FKgPX0M_|H&He3@wnL_`8v4^Rx9iU07ETKm-&M-CA z#B{Dvm4rsTzljV;vQ#7ZaE&6J721b~pAAhdD+M%KU(tfBNNA)B2bdb_1`<&d9Tgf0 zl@+FT4r4iKB-XTqo=+|)?^HuTvw3=jMvd>6re;p#S6stNg+@syz|_lWsAaJVg+?5o zWNKAqBylY@g~k^GT{W6Ib?Q)PXejyl`BiyeK0ZD)b?Q_)e*8F{J9my!Q&TB8I9T}I z;lqd1!Gi}WD=UlEu3bwJ5fQSd1`U(TjnArq20mbpk@*ZveB{WH)W3g!YTLFg1qS~A zoR*Z7P)<$`ojrS&_Uze1xw*Lx?K?3skrpgiP;T3?W5;OPv}xtGb?w@fHf`FZoER1N z@874PLx}=d-(97-L`k{-qG{t z&yARVqOFZaS7(CsBmfg^)v8sBsc;638#ktP>(*)7T5D|HyqWUy@;?2$xVV^>En8;y zy`4LE(uE5bKK=W{hYz%JMb?@Gt8Z~M}mo8lrUJVk_2imGa|Bi8? z%)MhZ?%%&(@hohCmA7coB07Km{HJZ<;o&rM=1dwgWQg$69z1w3J$drP8(qDn&{j1a zakBS5cI;T8$XLOXCr>UXvT9G~%$Y-{PMs32)Ioy=d8WAwd~O>(;Hy35@#!Zia9lPo6xfoLqwe zZKEJ`C)s<(1VuP<oi_oM=6NMv2 zjG!AgZqVYzi|N|6YetLR2||A*FCV~#Qf>_Otj58x6LlJxT z?%hTT9fi{_y{)Th)271hw{PDzWEL<}8#iurNMsehzP_|{=~AO_wviAz!ib5B@bcwL zLuP>$sdaMSzJ06MeRw(f`T3fG)siJk6qnQ>L_lciKR-jjAVN`5k@OjK>()&(@|jzdMCO+7tna9w5@RUXAcFdiCmM_r226QY9a)1>~$xoH#*!`t-50 z*8>I&pdCAQ$eyM@gm&xC(o#}VbZ7P8_gV|xrArq@99tlvuN4%j*tc(=ozSW&GC=4+ zn2xvJYBmszh=7DrWw6fRSpx+LBLJZbT_ucGcFt+Tr(sX6)1_K?{P?lrk=VjEB9(+9 zLxk3f-f(A^i3SZC2)82_tp}p-=`~{xqSV(2p^*nhxNM7%kPtf;FFrorZl!PAwoTJ4 z$h>m2!gK?Wk0TYx-m9owq=ZM2k#^fq*?9HpRXOS{l4@N!dR8S)hREMHD5!b{q4Q+# z70DVAqNAgw9!IMXpr?HRg$7ZZ!?S14j1c-q2%Rl^uV@(%K~#aR3U1!KDcp`qdS%f1 z4q6@zKsJQFC3~-@PoEavXy7`D+5(&f>U|>50c{4A2aDuU3-$DsTeFj~}lz=7@lt z^otkLpZo)DbJQw0mPKFLN0>5Y3QeCrUGwwz@82t-GVcE9-KfldBM*TDnR`wBKL)*1$N3B}5()44ok|A_uBB!OL z3C)C>+dv8we!9pMA+V{anGz=htq!+t-7>;#pj`AX)nosM5l6rTkdj0K$63IyMdAr% zD$V$o1wqNl$&{V#xB~_AhB1oT93(-}R$bAEFs70L4d@UXMOkzM!AxNV>+e&J{Oqe#kwM-{~hQ41jmRYy${+TS#q%#bdeBZu(mCHOT zDvH9w!jw=QExTB`NCsWMeqC{~FnMR&Xi-W-lVnUxjN($NW&`#Y_8Qqe6b3F|zHD^p zyZbA+=kk#`~YY9FqGBv6) zifk9Ht=9Et-8jNEBS(dX5133YdNjM2qkwBw=8Vul zF5_f!@rwt%4AAE1Tq|-`XaKG7X{MfqEP)@5JguQC z8Oi+rIQk!*ZKu3MmWoVX4H6l1jpcJER|&0}5&T5OijeSrR-G^q)27!h1r#QilDx(dI%T)CnWFrPUy5h&qX~*Zhl?0yWb0riJ#^K xv|hlDRUgVvLV(o`3}WW<)#}kNVE>;00{|uRSeAoP$^ifX002ovPDHLkV1oOejy(VX diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg new file mode 100644 index 0000000000..01b44f13a8 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png deleted file mode 100755 index 4fabf2fd7105b5b25abe6910d9bdb7f459395c2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2846 zcmbVO2~-nV77cAHv<}#Y9@~~U9m}N!$x;b~RK|cIL5PyTU}ymmEs}!NfuusJFacai z4~PPd?b?b+yS6&Gj{=I0f`WhqL17vZ6-LDc6c5U(PK70{Gcw0BIko)y|GxX*eeeBu zk`^fUwI4fqEQLa`m-2Ho-MBnCSPCZ{6cXGWt^kswxR6Eo~9sedq^}yXjR?f*{Gf zp}oj2A)qD*oq)wM7z|7Umx<}4Ss(;KEH;P5;V?)915eNru#us~rwubm5L~H8bp(oO z=@v#f5{oB<0O{$V1dYy0tHp=HL-P*(Kr!={O<2ZiE%}O z4q*i$I2Ny0A|!m;@K!kCvz&BsNbDyV`z%Magw z`l(Z61cs}z5rSY{wuV9{5bF_`!1M|Xiyh8#;4lkaEVg9TojywjD^ab5+S#IN$O@6b z1R?}T1jJywGdLa!5E8g^1t6Qj<_g&CL8uH#N%-o%19XDL+%h8=5Yr6BJCxZ zGTsuyVS5#6&-P}!xq%Sq25~(=&#f0KWrPIN6C{0$NqmDDy1L_ z(`#U|EKm&`jj(juXn<}_k3fvYVtO)gWOTXj&r8MPKs^?P#*zzokgqpg>LccXq(BCT z30jT_83v0mM2{{AAsBTt3^R$5LoDF`Ng28Jd-=J2QGc97JdMo7x{O7lPKZ4icIQG@~3Bcf=s z4o0ef=)?LSv{b5LZ8So*SQcQ>%Ca=0L2<0XB>b*>VC}ueH4G=ap=D@o!{mpxkt14? zT2Hp=W|xTPp^RQrUUkr{^xL+Kzj7k>ANO9I%YHm6EP_$J_2sJGTjwIyEn9G3 z54qmmgzcEwSX|Uqn^e`4lO*pFPH(-uEb?0_-Bv&HHRd~7s-)imz57_yajN*NIU|sD z&DK0ybM_x<^U!At6n+`W}~@t2=2a(Mm8>B-Xq?AHeb?Qz`vrOTf-b$T|K zv7}6gLtkp2@3_K$7Wy*QXG4;6f%nuMQd`H4E3FUx`EF;Ld#-un(!F!I(^0R?Z4bot zc~LRb6{>TeQ#*E^L5+WFFtyBG+Vxz%n6r(+D+p{KttKS+v#*JcB~`$p8QJqsGB3|8 z{iEqjndXa@kG~`d-Zr5vnWbKsC9F8AL zJ=HU3$+)WR3Bi=puXK}HbB}~sMqn6sV6$I1F75lo0&HQC95?X4_ zxpdn8K%=niFJre8fUonsMU8pQ`~~#VGLC-pmE+Nef@uM#y5#HJGpCvXd?mZJE@WK$ z^v&nZHt4FhgMF)_)~g-Li~bS5I|grgawjbyz0mC6ODb;7-kE`LEB&MEU5Ic{T~SM; zLSq^?T$#8f+75FqyD?*Ngtr60ucGFpO!eJ%KDqeBgte7ZQYhW~FF7@ptClscMK?02 z+VPnuPCAFr-2Lu1Puw5K^-5m4-H;IfRbOKFp84|Cx9+d<{KM%>lJotPn(w-I-J-f& z>Ms(w(xpj9o7<{pWN>y!9j}A!=gjvrG`kMJe)+O8Yo9}A)jMf$MQJ=0+U^$Ta=Lfj z3v>CXoP5R$?AVx_5lw}Ae@!g>HgD_edm(9>;Gzq)re?zP?4nGwtoQK2mI7KO=*lcP zadqmQh>%%dZMX=GCEvwZ?BR%Fo~@^~KHZAvY`^SS+DxTYI87Gp^FAQO7hV9J(wg3k zT0L7mtuf?9xP0PH>8aN#qO-PAo6ZB*O?ERJcTbM*yRCji?|kQ>sm(I%cUtb;-^X1# zYx>DhW2a|!b$0F#vchK%+h+@b_JZ83JIBKg6vybi;zQ;#YQv64H}(8Ifx0ecg(#r+ zXv=uQ@T5s@*V1{-=7#Ci)9z`e!b?X>3MM4PsqTsHtx3(!lO?;hx2WxHI}f-z%wj{T zxV_`+Y2;a}OATrLY4<)!TWOqM$=PG6p^w&_c>Sv5#_N_fD<-6v3^(Vu`oei%hu99yx#x56xwf}mw42)<<*aX diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg new file mode 100644 index 0000000000..d04f204e62 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png deleted file mode 100755 index 714c80f77515a94dcc6edc3d12324ff769d768fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2312 zcmaJ@dpuNm8=tq`E-xiwF-nagqUJsthG{;UGqWy@qzP{d$IKZsF&A?VGj8<~8x6@? zrR=6CsVSvWE|py&UeVPhAylSF7iCv;*%_Pm{p0ODpU*kJ%jfxipYQWL-#<=uC4?knLsAvbP+f>PKtmkoD{a5 zVE`bQuMo=-u}q55GlJo=7=(eMUBd_}P);D>iTaXe0=eA(A1aZ2 ziG~q>=x@FMlNjd3$svM21j}L+eBI!Lw)#|ZI!gh8h)ltg$)aYu=qHjPGFT*&V_2-| zu3=ViLB3e3zjT~Nak+FaDU5(pKI8>3usR;RSS+BkT`6o1iQ~#50&EhA?dn41a99A* zg-oWhS!*f887v^<$4DS4GJ_TTjrI5{R&NN2T$dSu6yjJ&z){E~nCZgl;;(C=eUnGbYckl@&4DiXRdS}(r>?*S9kbge@LqHyh3O0+(E1LDAep&FTjJR>OK{? zH7a+L<@SzG4<(}=dAHB~W;yyaXs?avSIbIcd?l$dy%8`izJ0{ra`0gm$COJ2{#i?# z^CDGc^LlMD#r`A5)Yu#(ca)b)p;J@h+Kc>=>ew~fSFOm0*>wf(Bi-=TKU}qpn^RY{ zn$760oo+-%d4VdkYwZQ&is7J4OS?7`<|3x?GjAh}ld++8DkCY?P$|r#Mwm%2ga$tc2*l4%ELcJ=$Sv*1~m!7sFvP2XB>vpU+y+}xqJ(n)P!fo9v0 zJ`KRagZ8=Xbs7A$nx)ps6-4xcdD-0lu{@7GaJv;wsPz}UInD8bZO_?_E}I92iOkw# zS7ydvd5^n}O${wg5?_C5+%o3WXg&Ov?tZz-I{BhGP+3#k7P_zgj-&F}T`^dZFNYHi zzS&uPHa~0LMCak=M~(Ho`MGxuZrJn7f>-8Xx0}0}&!rqJB$rihuF5^|cojb6#dRKU zKxPE+qYu5op-n(_PmUblSihwFaO>g+{m4B`{jG)BnNM~lro0-ShzKlq?|tp*(3bcP z7jDMmRxDUB?pt5NzcWx`#LTvVgYA08RRXJGzDeBg;^Bc#W-YGSil*HbM?7<^*X{!nr8>HQS{S>y0XxfUOJB&U}v`{!(IvpG9 z#b&#y1I$mF*`GJt#nE`Y?T)$pcC2rfKgi`SO?=g1=oziOS3JKq*@kB2QxbR_^Lt*) z_N)>E6N7DOJ8(ux?>WC!E>hb#)6^fP4mAu}2a`BC;)-r>HuMXo%#p^&=W$|fc2XRe zMccS7js7RhZc?+*OLv~#_cR7c9r`}Q<_=@;d9O`aY+Xf4}P>T&T0&5Hd~QV>ApVq zM!OSoZuLCRt0NV(l5cps8>w4=2;I)y zm3zFc?*6^>hNz2+qWw}QW#Pg9IHGcaA0+RaMX4Hj)jV*wYih!GqT}6JV&UVWb41Hg zMO*S8dop$jmYW_6;QeRa>W#Z6QZO&lnpSXO5AORNAF74-of7b~)%(`nwgcQ(6?qTs`S@Um z_2$_9sFCr5C3)xi)xv&x*M<>AT}b5qQlTI!R&8hY?4l%c?&iP*Qe%}x{N&-zkvAC& z7cuiB>gb{3(gy3~0P0w#X>;(zaV2Wwmeid`i>fn9K+taW#VNmFJ{uct$hhM1&T+`> z{%OJ`T$_n)eQwox;Na7^YnGSSI4w>V8B0#LibSQ?Zprfv3kDhvTU(C=3mCPk6U(k7 zvBAz5^Q^ey+?u>M-Wz)2pEj7hIzZTR#iI6-{>SU%&Yo zcQ7-aG_^Os+OW=X99=v7=uqD;W1-!#PcC0@y;m-3^9jDR`<=JZC(|%gT;f8vy5|QB P_5UVbY+s;kZCJ{m72(ZC diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg new file mode 100644 index 0000000000..bc849bbf9d --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png deleted file mode 100644 index 68bb5976f15b7125fca21f56aaa8b663ba68d705..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1639 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901SGegx)utgBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFl%InM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iK&9QrJkXg zv5BRnj)IYap@qJIg}$M&uA!NgiGh`okpdJb0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQL?oT3Q+yxH*|P zn;JQ~8aTQ+xxw_h~)xn-XroG5X;Q2UXBl}3}*6~3lfs;t4{uD4Edm1U}VKc4YGqg2~T@QP>2 z)RJKDZCx`KT7`1!NiB>G;ug(u)a>Hh#^?9%$x=n%clY*`@AR(zRlEFB_4{@2pU-<< z`TxSYnEQ)kx18N3&1CVQfte4JXl7%VDLBB0OmOB_Gkv{Ro{)e3WOH5k{O&M#5Vp5efRP9>OR}l!tb|E`+M8Z(&z14vgzlR)~_$094aZ?_f-3se4I~e-;4Iy zi&M{wzg=)^;l+FNq_WPfIdo*_orw9iN7_DT-pzhL`Q>{vv8BiFoMzp8lKh1m>zOUrZr{F>n<{Jr|?-@k8W73Y39mAO}&QFyJ})|pI= z_6gf2 + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png deleted file mode 100644 index da38f9834b4a9e107805b552115e0995249357f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1714 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901SGegx)utgBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFl%InM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iK&9QrJkXg zv5BRnj)IYap@qJIg}$M&uA!NgiGh`okpdJb0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQL?oT3Q+yxH*|P zn;JQ~8aTQ+xxw_hL~eJfq<0 z;uunK>&@)*-qMaD$FHu7(iIe1A{xw-F)eDvrRJ^2tJZ|CkE^~~zbyPe+xkbo{l5HM zwi(j48q03Ty9C@?q46WdFfZ-cUGvSGtqp7BEm_LTKYjar@B3bJ<}&^I$oEZmBl!gw z*b8tY9*YKM1iCY0dFl59!uf@N&W8M}l-_sp-p!Mz`qv)&8d`R9W5BE&f3cLOF?BD$ zT60B|S){eQ-?qHk-Mn+>M4_zXdsThz`5kuToaCb4IVEg=#ufeZsl42xemfRk_`c{c*d`{wZn)$)}=Esxjth{o&N>0g;6k<#e=b6b~l9*GJ7ijeGmP9X7+SxrEB?_ ze_qegm04bRFR#Gql}7pm+12g$h2_j8r}01ga&eV-^GoOTQ}X2GFC2e#lciL3T3p3U ze_p#9htv(zKg)PEyw^_sS5w$zyhKIjYV0G0yAyBCwEdyX+0s^G}|H`RMp^nQhe3RS;Y zl~-SQIb(KQ*3|xv$CG}uwkG-n>z{kp=WyfC;sqa+Po>GnsAjgTe-##-zI2KVZ&352 zlRht(o|L@1dY8qQO@|-xT(g;EVE4@T@Rx#+e^=JzpZVeLn6}r(RVI6DZB}NPdD@|q zy|H4e*>^|vm(2dlZ@0H|@>%cdPSsweOPm%~SCLa2COhE(qYM;HTy>Yj09bRVzu{ty R_zS8 + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png deleted file mode 100644 index 0e3993eb36794e52a26fef65eb90a33b9ff48b29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmaJ@2~bn#77i$gAXvasM4%y9ihYm;60$%9LXwIQOCVHMAtaY1KyqVpApw*fsZs$g zS_=``$|@j>R7zct85OJw%8pv36%Ya{wStAGFQH&N^B(Wc-24CM%=x~v&Y64EXW!@g zx@NjC7);-D57k$72B}{iZPk}h<*unZwnMZ4$PbK!WNZllbLWB)0Nhi^<^jF{n;Ub<} zP&66wS5N^AAGil70pK{KlRXE6#li7JB*w`ROC;LC9ncs83Qa&^9PKeqBrKZb-~eBJ z5GrpHZY0T2DK0d*F#^90o%p647Wn z1?z!xaHpZ&=@j}JmI`uWg@6cJ!*c(|QrE?*2SO-Td8PsqK^(xPOF$ufC2^8q{aD=B zvWsD_&sfycmL8=rYn-C6Px zrDEn_q1y*39pAiTZoZ`1^`Ytha8@c)tMRi7A*m;I^Zo_5C}yREq~`0E8{DdE9>SYx zY*JcgMam{_KmA8xYoY>_2ht&4*yRS&ME46Wr|Z|rejxegyWr{Ko~~12l>Hi? zwq4TY>EuN#SQT_}zc+s3!`~b3x~Zc&sW*iaAT#V}=%&k+Ut_&%k_j@A{1B^|9xCBw@8yr)KjP7Wxg2L7 z*t%?_`7^z813~*_J}jH6$g>W)mzYbxZafhB@E9qmFLQ(5i23QD zN0morL(J>&jKYXVP8Y{4D`K*v_a=H9`|Q#Jt{Wv7Y&JROkTyY?GMh@wf`6V7w%mv7 zsW{%BVkk~2P#6{QCd~K`w6sFH^y0uOPV8h1wBzV^h^;xZx@Fp-ua%UKO2oJF3e7wE zxZ4UsEBcY?HeMZ15}cDn8w}HqC4#}_{hyLEQHx={W4VE4uCutE7{-pEKHtj`L2}cfFJV;;o1I7&8Gk!9d?@M^I zB|DR4s>CTNBM~2c!n-d%^R5JIv2U1fpWbX0c<1dEa>ugOC)THrPnqbs6goO;Hodx1 zv_+@4MG;g#=~sBRpMN_jRP=LTnMp&-b-y+fvSj#&{>abhiqW{{>-9?g{HO?+^AjI> zD=)yOR+3ve!@Q{d%M0Y)pKjj?7PrVI+p82w%lZo#PWV`I ztW}#^^NINWJEOE*{rOHpr&kcR{IJu|4hyMc(`!3|qq1dOQIhJHBeX5+&zg&Ns{SSl z8+F06&v^95nL1Y}_m8{`g4uBRBY911biw__wrYmu>=Ft6s`mG{4~KtiVn7G=pU-^t z)wEFsV?b<6Pfy$JHQbiMJACf!_StM^6jBE}*VS{^X?Se@>|W<%?MeAgBQM4y`JI&k z@rC}^T*qL=$&K@^)(5hki)q^49sjjt)Jw;(N411jmQLFI7bzOB{OZ@}t%PuY_3wZu LZ6CFs5}x)S!$o_{ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg new file mode 100644 index 0000000000..7a1c7de013 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg deleted file mode 100644 index 1991096926..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png deleted file mode 100644 index bc5afa1a2e9332b98ca1981afb9d87995809b68a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2409 zcmV-v36}PWP)YH1 zb`Jdx$DA;rsScjUx93uHGMHZ!VpkMm$^(9|5;hTe$o28pL`9Q!uTizz|RMIS>K zK;o-_^D@^=ps78(9{mM64O)-VI8W<2k4iyja+`Dkv|cUXJZ7o_JpjEAJsMiSMsr>V z$Ob)}zvW)gcGQdWJX{uN8t~bH?gDL3l;@wAfl$!d=x@;(&~}y1401$)?#$n27Ff#S zySlT{pxx+ic#ObOP<@z*+epywp~qNk8;O{#Gz#=%=oc)eG4(t%iVHOL_df*zgDkB` zHfEH2r=V@z{migfHYsAX?sf(8c5{X_TsT>DgzYeb8F?<4kmZ10?QM|kH0I{1sSm(k z6#>}!PXlZ@TL-n`XA5Z{YCih&sHHZ>oFNUUoC3i!54mY}SoMGhdZdW0nJ!ib;N?AD zD6aC0hFyy8kFIQP)v;VO?37m9{V5GG}ZC%w0%0ahLH zL1~RKs{k^SZScY{H{@qIZvKqYT=i?6_GJoGXj*LX?Wzvy#|s}@?w4T)r!M8P8v$6h z&ubWDt+K>xE#L2j^A)%1WlEFMmY@X?v6R6cru|QL$wopYQw9+T;R<4Suk{vc_eXr;A?P@*f@n8)a8L2+Zv=Qi878}Dg zD-tx-nlmjfhHECXy$PCz`#M=%jPIAB@6&^xVlfe>DSFWP77t+>9|BENF(Xw*;t<&4 zayyiRCbn(@JqVh&ok5uT3+$~8>R?w5n%EAaD2AwxWB`Jm-QQ*Sbsx`j!kBIjGgKc# zXk=%g86sIU)CJRW9Z*zhOfNAv%?7>O+rcCnM4(Nxtc$?(Zr>^&h`IEY=YS>A%CTD= z6*(Oj0^PylAY2^@w8!EgTpj|QYH<**6awwDIEWX4uCg!)SG5INj=WB@fZlzv0X{xn z2mjXiVQ6OuEVtTv6_*E*=<*K7NUGCSG z8(gUJYir~VmNvjkd%W5#c5_9aUHr3G``sJ$pe-|?(SiLR;X!Xog~m_ zq*oPqJL^j@E!nk4RL41~wib<3(+Z^Qhy{~$%?Y|CVU*@sHC4%J%E_OyQ?2p^VAsW4 zMQ|{7P~RTwfj;SWNOjv_Or`@?KbRD@Y^*7{@UyGOC27A)*Pv^?gV!9W8~CSHOV_+g zs*Y2%nv|xp=(H`Vvn;ff_Va?IsH;AOG-T@nFmHRU)-sVSIz%fy)H6IRJ9Szd{vx&# zWR$RSOoLh^3Lpcs^@Z-MT`D3tan%oVw$;McbM=|j4O}C*L{2S zUN_9hbKa~%mX2`4Tzu#X-n$a1v-(DcJ>vPXPG%%84tGHp-Ig>e$!m_q-$!1H*U;Y; zU6XBET9UOMbmyPiqx@&Jj3^%H?tp2z;Z??4hke?}TiiVayvCb{ykV^vO6&ga(uPc{ zBMWWhGnsmbpHN{F8ATd)kqbw-8?_QX$`?CNOjXEiY*UNeGsD`zEFo5jCehg(H6o*U zhT(Ut%uV+h z9vf_$ngr>dTcx=Sdxl=YEiVsp?WDVdXncjL5CJ_#+Lqi8qHMa4)o-E?(n-0W85zZE z*zD3nrWuj>+iRtO-Z&)*dZq?%V2WW0*4Kr5y+$Wh7!C66N_6P?ME&&1V5vF!5rX?w zqTVLlU|LI9v~=4NEw(8D z6D%WBsB7GeYth1^JJ}ybFBzDG{m2rzEv0j;$E1%k`6z5~Utt5*G9aLV|8HYwH%*y&7>j{GGg>mFbP^D38CQ@?=y be*p#n#vo&@_q@Em00000NkvXXu0mjfg-w8~ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg new file mode 100644 index 0000000000..96ccf5f9b4 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg deleted file mode 100644 index 87c98f79d2..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png deleted file mode 100755 index c7c0e067c83fd0222cbee6d354e73ed5e2eb02b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3811 zcmbVP2{@E%8%A~|TgZ|zLY7&LVJ1V<5VABeWT`aGe8a>n&5XS)6`@XK38gG8vL+>k zlBFn0XhD&sjgq1tN2>pul5@`gpZ@Dy|9sc?eed_a_jA9`{XEb6T-PL$UG102YRHO+ zh%9q-uyq69KEhjC418AKee40gWVjCAd=U{jW#KIS4z;m{ScTz10u~^kLc&-GhQgRbEO2lX)(nHgnL^M=lqCXbi9ngbP*^+$iASR$3qL5h8;{PwyV-77*bDq3 zKm!Bf1l z$VlDE2^J8bpr=11u(*q~Z2m%+zVko$H5)YsXI6Ml66ZA97n-b=x8hr3q#YfbQlIKNth)P%YdN)GX@HY zF#{~Amf!sX?QJ=4Kwm%fIm>xWd6U53EYo6!$(h#yJ#L-+T! zKQ*qOaIhN+hl_0({8(({02`#{fo=N!Si6IWh;*i-Es+w|H}1>y?e#0qtzw1Zk>y1x$Th4y0eS9~mIgXT7^Lln- zWw11VX1PJ3ftFT95KMKr;j@l`s@CH<tS9zP<|v3R?5S3bzYt zJ;F}~mbAd9Labs36+8QIE=8K8wATnS1R51 zW=Ps9SLE27w&GatZu~d_t+|ZOR=A(~sbzEd>CTHow>I$sO3;(LM8MjdY59QoX(WyUVt(eG7^_k&dwU!(0W*%sZ{;Nru%@7;SJ z9zM~m@oDWlnYSK<{radU0BJFDOP?t)L8)OSZm_U#ju&2HbNnV`)fynD&$I zSF?B>=T{G)$VRT$#-ta^Mr)ZoMr>e@M&KwSlAwz9_Sux%+;Q!>;+!iI9yJgDmu&eA z{(vFhwY-axVXY}+>9GAkGP!KLE8IKY{K=?k_?rWyzQmn7Oq|c!+YTPl?~osYgp_!w zHfqSPbY!lq8GOLfo;0zR(wf?zd?P(I$>!aNGkqv!GR~;qF}kGLz|_zwT0(13qeuLh zp}LOhU~OYzZ!5m7*05)*W+3JH@ieD>B?Cx7W%_6+RpMgB=s}eY`i%MM=yQ6qQcogQ zwj@j(IyQ-BKIbJ^*%yq&wh11tjH=cb*WEjoYL&9{25hi8I!jk&V9&heNB5}nW?hM% zDZ?uxzLc~yPEmW{_;JyRF{a#U_H}mM*@;4`qwY-Js$q$fb=WVBm+TuaQE{~#*yvK< zNExYj#yzX`rlPY)3?n@J=HDllorMd$4}TEwsk(=XPc{WBOtu$ADnQiFjI_8*Z|J0+ zbsTk#jIN~tsh08|#5!|{8DywOmd=@C%@9w0?bLl;x7zLE)?qw4!ck&%tG3;}H_}qm z;J3QvW5db(aT6t_BM&wrBYl!FkB0G(-6l6pq{7#dCA0G}j|v)-*H4_zH7w+v{7uEJ zFBLr$kx{}cpeCfLLdgt!jjOs=>-=LPBSdB;xjhRIcM3qT4b!upG zQ{bZKJM!l7CYk{fO^>z|Qu67SPvpxG_O{3D8wzN^9jWb9u;8}B9FjLy>_1)f9+zW~ zX(L7z+ZS*(-A{+c-CAVu^t_YobEZtbX@XMs@0hORL*;&nFw1?n$iwRmTKg%w-m!Z)da*1eqf%-Pa!Xx4-ms-a4jyjN(!1)-6t9mTXM3x|Z9k<*b2YsXO!3DN5#Q zYPue-eNXP#r)S$Ot-jKx7Tlm{f^n{t-;op4b@cs*p(h$j9=wyImGoT;lgS zLr-_m9-Zlz{Q|FXTFQQ-vCRlWeR@)SkA7mp?29QXtlsu|;CRPtDW+drNA>cM;`iZZ z^0DrkiDDU?+bZ-z`PEi0nDyH8ilsOm!?fg`|D$r3~PE=xvaa8Yi$^ znN)cnKeD}%SnNd^U*0ADJNaaWV8|fnlHn+x>nI(~Dv*eRy}q*CjHo>RJS`>uQ^Sy~N7be_k-8q0sBIYm zqNNq1K@&p`8$;0tYa#Vw9xv76*YNCS&oi0}F{WD2#u?AfdD267^(?J_GnKPO?liH> z-7VHUFJ8gcldNTuHvKikeY^GM8j7DR@8A^|nKNnai4}oP(S&p9avQMv%N(R?YO2Jg zUZ}Lrooj#hCi!mc?j&dD$W`h`M+*IVO@@3BCUW&>t{aqw$J8s;kxz!#X$JBJtT@&je7~2$93#iG`Td6sTj#6^l>s@puY}^sFsvoG0wl3u44DLq+q^~zdC&T yVF;mSNP;MR*xFcE&vP)Lsww8zm!5U85vVE_eJwtW4Leg6iawHyQh diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg new file mode 100644 index 0000000000..61965fb810 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg deleted file mode 100644 index b2ced66189..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png deleted file mode 100644 index 5fb54a4175012bb372cd0a003bdf0525abf8c04f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2810 zcmVY@(q=M zg379xXf#2zNN6y15))Hr8Z&XyGzPJ$iL?`q(P=tW+a#uOw3y5!#IzYP@tnr!gX?Dl*G z83_D?WL(Q+ewwv`Ytuo~u`iJyB4c6bA(qMhC2NZ(XB{3Je3v5MMvjJ|k8ETG@^{EW zUV1dmXA6)!hl!GVF`BihfVFXOJz5xCho;f`Gvxg+eDNIfR2L!5TJ-1?x%(DO_+&jUG+6(cTfJZ~Ik`ETSH7`X^#I+(*e zOON;HNcL-v1s!AAT^;FZ7u*l|IWn0;H(D!_EO-?~ebOtddEF z^(c!s+lpKsTfS2m$aKsD$Ho%xjS@ZGu%hMwblH0((@h8nfem-fbh&)WGZFJj!D_dO zGLS4@Ml#ds9fRQ#H3o|l*M5YJ4M$|9TpBq67LG|!T<#;7mh#A9Q^QeF29*ZJCAarz zy4Mz~HB!89J`LZrHp-^^+qg6s>px09IE-oD!nAVuy7hlz-6~>nY}rm9)}vANc6%B! zf_?Tn?Z~{^@1UuxLsH7oK7Q~H+FT?3;iN2T1*M_1QlPr>YQ7We2K7ifoy`VA^jhpN zpZ%{If3)6!7tS7l9+}nQS;3L;(ogSkTFz>`MrovA!$wnGmaa}vyPc%l{-z^Si^=A} zHZ#24ctSSa%DAbJKKjnE3w=k|#MPI(CK zmFbmD*6WZ}u?H;Oo#NkPjQ+6q?u8KJCmks`(ta5pKUoCbcDq)JCi@slHhMBL0MxZz zee6O9<@xIU&}OqrN*j#|-I|o%H&3O{a!PLNwu)tU_w;~P?PI!~Or|3hG)6<`RajFa z@1E0PlXp?fXoVpAD^tSRFuqL)ZE`YsLa*Dbu>-37m`DgkSc z`%kG+UMi!*)&;z@i*!sjIs!PtDRR-zA9g$c2Fy!kaE1sn9bvo$&;QX_1z)!`xZE1b z^H0pn;bK5Id4~QPcuSHb;r?*upg4C{3Q9|PfU~wR`qKuQU>>`Gr3+p3s{Nw-EC))n z674eO;dFf~h*nt0Q}6>0;mXv^00Mv=xCPnhb{;!HnDHm@_mm9q5#-fPY4S}OVjfNx zY_HO+qn*c|yu~yZqWzWcc!)xGobm{KcIZy@4DH-0`q{CQ;lc2Dm-A7cWtewI!%5zn z)Iz4i!qaUwH7Fd`C(m-bMeCAgie+$SIxdsxsORNp5A-oY{*+A7&2|@*m&%~BI6^J; z=qg@*`3)1(AbFJZDmLx==#+8Msf>*iXY3$VA0rs~v!oSQlJT$MG!lb9QmLfhN7+y1_%clG4hk7WyP$hoO2#bUHQ3;ai zUpLKxW34|xLx<+${TZ^+)oi&%6Bq>pA(5~;`CcvU zbNPk&%dEZoI*PT3)6NNtg%yd@WV^)n+T(Dj<1c+KZW}Rz&11)1{oK-++v2U=Z-qPPS*}wnxx|lSjX0B^Tawez*i0#9AUge$Y!;| zh6dzYsTmL@<6>Xw>V#Dl#n97ZcUl%*d$D4lm{!t7$GWy)od$KoqomW)-k=iM5gYOo zwd~fi#Ho-KsbCem@&GhmzbacErFpsXplo>$V4YOAiuU=_`UTI~nCa;IcDEWePYnr& zwUh3XRSHexip=K~m-~ge7Iv|zpA@KWl0hX+@9rNa?ft$4dCr^lj`Hz^{Cl#%*C0LJ zs&2Qyrc;MpE`KBDp}bO{x=99-#mjmoT^8R|^i9y^_q;hOY?zV`<7Hgz8@6s(d2BCq z*j(QzPI+E9_N`ck6i5b=#mgwDe>kUa?kObfxkb11fD5gP27!*jfVM})*FBQc+UJuONgQMYh;>n&5v0TR6dj)xL;xCheR>vzoM2QcDhmFM^;DeM>$Fb3=vrmD3W`|OI!*n)q zyhS1-{Q@~`CZan%9MbR!F+piI-W5%N(a#a5Ga{feN_;-j^{TwztD zXcu;1UPdki$I-r#BV5U(i-+0&is0(Y5x*HrvvJZ9aWo;?+ zRDqs;`y0hZvXRdqFAc%C#U&jE|(r*kqrwYQdb+8<`q z&M#mDzOK4IsNtoI1ZOW`r!z&u*^dy|ZvZ1@wy@r+$qU$(;{O5+0A^ZhFpVTZ;s5{u M07*qoM6N<$f+W~&*Z=?k diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg new file mode 100644 index 0000000000..e6f660410a --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg @@ -0,0 +1,4 @@ + + + + From 372fb0d51d6e2e43a0ea3df6249de3e3026fd498 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 12:57:01 +0300 Subject: [PATCH 268/290] remove CoinMarketCap logic --- apps/explorer/config/config.exs | 3 - .../lib/explorer/exchange_rates/source.ex | 25 +------- .../exchange_rates/source/coin_market_cap.ex | 52 ---------------- .../exchange_rates/source/token_bridge.ex | 2 +- .../source/coin_market_cap_test.exs | 59 ------------------- 5 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex delete mode 100644 apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index 39307741cd..10e8a66e82 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -31,9 +31,6 @@ config :explorer, Explorer.ChainSpec.GenesisData, enabled: false, chain_spec_pat config :explorer, Explorer.Chain.Cache.BlockNumber, enabled: true -config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap, - pages: String.to_integer(System.get_env("COINMARKETCAP_PAGES") || "10") - config :explorer, Explorer.ExchangeRates.Source.CoinGecko, coin_id: System.get_env("COIN_GECKO_ID", "poa-network") balances_update_interval = diff --git a/apps/explorer/lib/explorer/exchange_rates/source.ex b/apps/explorer/lib/explorer/exchange_rates/source.ex index 6d95e48796..fdb0e06fc3 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source.ex @@ -2,8 +2,6 @@ defmodule Explorer.ExchangeRates.Source do @moduledoc """ Behaviour for fetching exchange rates from external sources. """ - - alias Explorer.ExchangeRates.Source.CoinMarketCap alias Explorer.ExchangeRates.Token alias HTTPoison.{Error, Response} @@ -12,28 +10,7 @@ defmodule Explorer.ExchangeRates.Source do """ @spec fetch_exchange_rates(module) :: {:ok, [Token.t()]} | {:error, any} def fetch_exchange_rates(source \\ exchange_rates_source()) do - if(source == CoinMarketCap) do - fetch_exchange_rates_from_paginable_source(source) - else - fetch_exchange_rates_request(source) - end - end - - defp fetch_exchange_rates_from_paginable_source(source, page \\ 1) do - case HTTPoison.get(source.source_url(page), headers()) do - {:ok, %Response{body: body, status_code: 200}} -> - cond do - body =~ Explorer.coin() -> {:ok, source.format_data(body)} - page == source.max_page_number -> {:error, "exchange rates not found for this network"} - true -> fetch_exchange_rates_from_paginable_source(source, page + 1) - end - - {:ok, %Response{body: body, status_code: status_code}} when status_code in 400..502 -> - {:error, decode_json(body)["error"]} - - {:error, %Error{reason: reason}} -> - {:error, reason} - end + fetch_exchange_rates_request(source) end defp fetch_exchange_rates_request(source) do diff --git a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex b/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex deleted file mode 100644 index efe592e0fa..0000000000 --- a/apps/explorer/lib/explorer/exchange_rates/source/coin_market_cap.ex +++ /dev/null @@ -1,52 +0,0 @@ -defmodule Explorer.ExchangeRates.Source.CoinMarketCap do - @moduledoc """ - Adapter for fetching exchange rates from https://coinmarketcap.com. - """ - - alias Explorer.ExchangeRates.{Source, Token} - - import Source, only: [decode_json: 1, to_decimal: 1] - - @behaviour Source - - @impl Source - def format_data(data) do - for item <- decode_json(data), not is_nil(item["last_updated"]) do - {last_updated_as_unix, _} = Integer.parse(item["last_updated"]) - last_updated = DateTime.from_unix!(last_updated_as_unix) - - %Token{ - available_supply: to_decimal(item["available_supply"]), - total_supply: to_decimal(item["total_supply"]), - btc_value: to_decimal(item["price_btc"]), - id: item["id"], - last_updated: last_updated, - market_cap_usd: to_decimal(item["market_cap_usd"]), - name: item["name"], - symbol: item["symbol"], - usd_value: to_decimal(item["price_usd"]), - volume_24h_usd: to_decimal(item["24h_volume_usd"]) - } - end - end - - @impl Source - def source_url do - source_url(1) - end - - def source_url(page) do - "#{base_url()}/v1/ticker/?start=#{page - 1}00" - end - - def max_page_number, do: config(:pages) - - defp base_url do - config(:base_url) || "https://api.coinmarketcap.com" - end - - @spec config(atom()) :: term - defp config(key) do - Application.get_env(:explorer, __MODULE__, [])[key] - end -end diff --git a/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex index 03234ff649..531e3ab181 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex @@ -45,7 +45,7 @@ defmodule Explorer.ExchangeRates.Source.TokenBridge do @spec secondary_source() :: module() defp secondary_source do - config(:secondary_source) || Explorer.ExchangeRates.Source.CoinMarketCap + config(:secondary_source) || Explorer.ExchangeRates.Source.CoinGecko end @spec config(atom()) :: term diff --git a/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs b/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs deleted file mode 100644 index e0f1693212..0000000000 --- a/apps/explorer/test/explorer/exchange_rates/source/coin_market_cap_test.exs +++ /dev/null @@ -1,59 +0,0 @@ -defmodule Explorer.ExchangeRates.Source.CoinMarketCapTest do - use ExUnit.Case - - alias Explorer.ExchangeRates.Token - alias Explorer.ExchangeRates.Source.CoinMarketCap - - @json """ - [ - { - "id": "poa-network", - "name": "POA Network", - "symbol": "POA", - "rank": "103", - "price_usd": "0.485053", - "price_btc": "0.00007032", - "24h_volume_usd": "20185000.0", - "market_cap_usd": "98941986.0", - "available_supply": "203981804.0", - "total_supply": "254473964.0", - "max_supply": null, - "percent_change_1h": "-0.66", - "percent_change_24h": "12.34", - "percent_change_7d": "49.15", - "last_updated": "1523473200" - } - ] - """ - - describe "format_data/1" do - test "returns valid tokens with valid data" do - expected_date = ~N[2018-04-11 19:00:00] |> DateTime.from_naive!("Etc/UTC") - - expected = [ - %Token{ - available_supply: Decimal.new("203981804.0"), - total_supply: Decimal.new("254473964.0"), - btc_value: Decimal.new("0.00007032"), - id: "poa-network", - last_updated: expected_date, - market_cap_usd: Decimal.new("98941986.0"), - name: "POA Network", - symbol: "POA", - usd_value: Decimal.new("0.485053"), - volume_24h_usd: Decimal.new("20185000.0") - } - ] - - assert expected == CoinMarketCap.format_data(@json) - end - - test "returns nothing when given bad data" do - bad_data = """ - [{"id": "poa-network"}] - """ - - assert [] = CoinMarketCap.format_data(bad_data) - end - end -end From 56bb2018fb4cde594adc425217479095db91eb86 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 13:15:22 +0300 Subject: [PATCH 269/290] fix test --- .../exchange_rates/source/token_bridge.ex | 10 +++++++- .../source/token_bridge_test.exs | 24 +++---------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex index 531e3ab181..aa2b849a11 100644 --- a/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex +++ b/apps/explorer/lib/explorer/exchange_rates/source/token_bridge.ex @@ -30,7 +30,7 @@ defmodule Explorer.ExchangeRates.Source.TokenBridge do btc_value: original_token.btc_value, id: original_token.id, last_updated: original_token.last_updated, - market_cap_usd: Decimal.mult(to_decimal(Chain.circulating_supply()), original_token.usd_value), + market_cap_usd: market_cap_usd(Chain.circulating_supply(), original_token), name: original_token.name, symbol: original_token.symbol, usd_value: original_token.usd_value, @@ -38,6 +38,14 @@ defmodule Explorer.ExchangeRates.Source.TokenBridge do } end + defp market_cap_usd(nil, _original_token), do: Decimal.new(0) + + defp market_cap_usd(supply, original_token) do + supply + |> to_decimal() + |> Decimal.mult(original_token.usd_value) + end + @impl Source def source_url do secondary_source().source_url() diff --git a/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs index d5bd5f9b96..078c280fda 100644 --- a/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs +++ b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs @@ -3,27 +3,9 @@ defmodule Explorer.ExchangeRates.Source.TokenBridgeTest do alias Explorer.ExchangeRates.Source.TokenBridge alias Explorer.ExchangeRates.Token - @json """ - [ - { - "id": "poa-network", - "name": "POA Network", - "symbol": "POA", - "rank": "103", - "price_usd": "0.485053", - "price_btc": "0.00007032", - "24h_volume_usd": "20185000.0", - "market_cap_usd": "98941986.0", - "available_supply": "203981804.0", - "total_supply": "254473964.0", - "max_supply": null, - "percent_change_1h": "-0.66", - "percent_change_24h": "12.34", - "percent_change_7d": "49.15", - "last_updated": "1523473200" - } - ] - """ + @json "#{File.cwd!()}/test/support/fixture/exchange_rates/coin_gecko.json" + |> File.read!() + |> Jason.decode!() describe "format_data/1" do test "bring a list with one %Token{}" do From 9bd5ea52710b2b3bc1d5839e27e3c011fc10d630 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 13:20:44 +0300 Subject: [PATCH 270/290] add new column to env vars --- docs/env-variables.md | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/env-variables.md b/docs/env-variables.md index 2b4f767f13..2dc8763b8d 100644 --- a/docs/env-variables.md +++ b/docs/env-variables.md @@ -14,55 +14,55 @@ $ export NETWORK=POA ``` -| Variable | Required | Description | Default | Version | Need recompile | -| --- | --- | --- | ---| --- | --- | -| `NETWORK`| :white_check_mark: | Environment variable for the main EVM network such as Ethereum Network or POA Network | POA Network | all | | -| `SUBNETWORK` | :white_check_mark: | Environment variable for the subnetwork such as Core or Sokol Network | Sokol Testnet | all | | -| `NETWORK_ICON` | :white_check_mark: | Environment variable for the main network icon or testnet icon. Two options are `_test_network_icon.html` and `_network_icon.html` | `_test_network_icon.html` | all | | -| `LOGO` | :white_check_mark: | Environment variable for the logo image location. The logo files names for different chains can be found [here](https://github.com/poanetwork/blockscout/tree/master/apps/block_scout_web/assets/static/images) | /images/blockscout_logo.svg | all | | -| `ETHEREUM_JSONRPC_VARIANT` | :white_check_mark: | This environment variable is used to tell the application which RPC Client the node is using (i.e. Geth, Parity, or Ganache) | parity | all | | -| `ETHEREUM_JSONRPC_HTTP_URL` | :white_check_mark: | The RPC endpoint used to fetch blocks, transactions, receipts, tokens. | localhost:8545 | all | | -| `ETHEREUM_JSONRPC_TRACE_URL` | | The RPC endpoint specifically for the Geth/Parity client used by trace_block and trace_replayTransaction. This can be used to designate a tracing node. | localhost:8545 | all | | -| `ETHEREUM_JSONRPC_WS_URL` | :white_check_mark: | The WebSockets RPC endpoint used to subscribe to the `newHeads` subscription alerting the indexer to fetch new blocks. | ws://localhost:8546 | all | | -| `NETWORK_PATH` | | Used to set a network path other than what is displayed in the root directory. An example would be to add /eth/mainnet/ to the root directory. | (empty) | all | | -| `SECRET_KEY_BASE` | :white_check_mark: | Use mix phx.gen.secret to generate a new Secret Key Base string to protect production assets. | (empty) | all | | -| `CHECK_ORIGIN` | | Used to check the origin of requests when the origin header is present. It defaults to false. In case of true, it will check against the host value. | false | all | | -| `PORT` | :white_check_mark: | Default port the application runs on is 4000 | 4000 | all | | -| `COIN` | :white_check_mark: | The coin here is checked via the Coinmarketcap API to obtain USD prices on graphs and other areas of the UI | POA | all | | -| `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | | -| `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | | -| `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | | -| `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all | | -| `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all | | -| `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all | | -| `ECTO_USE_SSL` | | Production environment variable to use SSL on Ecto queries. | true | all | | -| `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all | | -| `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all | | -| `SPANDEX_BATCH_SIZE` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | -| `SPANDEX_SYNC_THRESHOLD` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | | -| `HEART_BEAT_TIMEOUT` | | Production environment variable to restart the application in the event of a crash. | 30 | all | | -| `HEART_COMMAND` | | Production environment variable to restart the application in the event of a crash. | systemctl restart explorer.service | all | | -| `BLOCKSCOUT_VERSION` | | Added to the footer to signify the current BlockScout version. | (empty) | v1.3.4+ | | -| `RELEASE_LINK` | | The link to Blockscout release notes in the footer. | https: //github.com/poanetwork/
    blockscout/releases/
    tag/${BLOCKSCOUT_VERSION} | v1.3.5+ | | -| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | | -| `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base | v1.3.4+ | | -| `GRAPHIQL_TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) | v1.2.0+ | :white_check_mark: | -| `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 | v1.3.8+ | | -| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | v2.0.3+ | | -| `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 | v1.3.9+ | | -| `ADDRESS_WITH_BALANCES`
    `_UPDATE_INTERVAL`| | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 | v1.3.9+ | | -| `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer | (empty) | v1.3.0+ | | -| `COINMARKETCAP_PAGES` | | the number of pages on coinmarketcap to list in order to find token's price | 10 | v1.3.10+ | | -| `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects. | (empty) | v2.0.0+ | | -| `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876) | 600 | v2.0.0+ | | -| `ALLOWED_EVM_VERSIONS ` | | the comma-separated list of allowed EVM versions for contracts verification. This var was introduced in [#1964](https://github.com/poanetwork/blockscout/pull/1964) | "homestead, tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg" | v2.0.0+ | | -| `AVERAGE_BLOCK_CACHE_PERIOD` | | Update of average block cache, in seconds | 30 minutes | v2.0.2+ | -| `MARKET_HISTORY_CACHE_PERIOD` | | Update of market history cache, in seconds | 6 hours | v2.0.2+ | -| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | -| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | -| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | -| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | v2.0.3+ | :white_check_mark: | -| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | -| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | -| `CHAIN_SPEC_PATH` | | Chain specification path (absolute file system path or url) to import block emission reward ranges and genesis account balances from | (empty) | master | | -| `COIN_GECKO_ID` | | CoinGecko coin id required for fetching an exchange rate | poa-network | master | \ No newline at end of file +| Variable | Required | Description | Default | Version | Need recompile | Deprecated in Version | +| --- | --- | --- | ---| --- | --- | --- | +| `NETWORK`| :white_check_mark: | Environment variable for the main EVM network such as Ethereum Network or POA Network | POA Network | all | | | +| `SUBNETWORK` | :white_check_mark: | Environment variable for the subnetwork such as Core or Sokol Network | Sokol Testnet | all | | | +| `NETWORK_ICON` | :white_check_mark: | Environment variable for the main network icon or testnet icon. Two options are `_test_network_icon.html` and `_network_icon.html` | `_test_network_icon.html` | all | | | +| `LOGO` | :white_check_mark: | Environment variable for the logo image location. The logo files names for different chains can be found [here](https://github.com/poanetwork/blockscout/tree/master/apps/block_scout_web/assets/static/images) | /images/blockscout_logo.svg | all | | | +| `ETHEREUM_JSONRPC_VARIANT` | :white_check_mark: | This environment variable is used to tell the application which RPC Client the node is using (i.e. Geth, Parity, or Ganache) | parity | all | | | +| `ETHEREUM_JSONRPC_HTTP_URL` | :white_check_mark: | The RPC endpoint used to fetch blocks, transactions, receipts, tokens. | localhost:8545 | all | | | +| `ETHEREUM_JSONRPC_TRACE_URL` | | The RPC endpoint specifically for the Geth/Parity client used by trace_block and trace_replayTransaction. This can be used to designate a tracing node. | localhost:8545 | all | | | +| `ETHEREUM_JSONRPC_WS_URL` | :white_check_mark: | The WebSockets RPC endpoint used to subscribe to the `newHeads` subscription alerting the indexer to fetch new blocks. | ws://localhost:8546 | all | | | +| `NETWORK_PATH` | | Used to set a network path other than what is displayed in the root directory. An example would be to add /eth/mainnet/ to the root directory. | (empty) | all | | | +| `SECRET_KEY_BASE` | :white_check_mark: | Use mix phx.gen.secret to generate a new Secret Key Base string to protect production assets. | (empty) | all | | | +| `CHECK_ORIGIN` | | Used to check the origin of requests when the origin header is present. It defaults to false. In case of true, it will check against the host value. | false | all | | | +| `PORT` | :white_check_mark: | Default port the application runs on is 4000 | 4000 | all | | | +| `COIN` | :white_check_mark: | The coin here is checked via the Coinmarketcap API to obtain USD prices on graphs and other areas of the UI | POA | all | | | +| `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | | | +| `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | | | +| `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | | | +| `SOURCE_MODULE` | | This environment variable is used to calculate the exchange rate and is specifically used by the xDai Chain. | false | all | | | +| `DATABASE_URL` | | Production environment variable to define the Database endpoint. | (empty) | all | | | +| `POOL_SIZE` | | Production environment variable to define the number of database connections allowed. | 20 | all | | | +| `ECTO_USE_SSL` | | Production environment variable to use SSL on Ecto queries. | true | all | | | +| `DATADOG_HOST` | | Host configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/) | (empty) | all | | | +| `DATADOG_PORT` | | Port configuration setting for [Datadog integration](https://docs.datadoghq.com/integrations/). | (empty} | all | | | +| `SPANDEX_BATCH_SIZE` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | | +| `SPANDEX_SYNC_THRESHOLD` | | [Spandex](https://github.com/spandex-project/spandex) and Datadog configuration setting. | (empty) | all | | | +| `HEART_BEAT_TIMEOUT` | | Production environment variable to restart the application in the event of a crash. | 30 | all | | | +| `HEART_COMMAND` | | Production environment variable to restart the application in the event of a crash. | systemctl restart explorer.service | all | | | +| `BLOCKSCOUT_VERSION` | | Added to the footer to signify the current BlockScout version. | (empty) | v1.3.4+ | | | +| `RELEASE_LINK` | | The link to Blockscout release notes in the footer. | https: //github.com/poanetwork/
    blockscout/releases/
    tag/${BLOCKSCOUT_VERSION} | v1.3.5+ | | | +| `ELIXIR_VERSION` | | Elixir version to install on the node before Blockscout deploy. | (empty) | all | | | +| `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base | v1.3.4+ | | | +| `GRAPHIQL_TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) | v1.2.0+ | :white_check_mark: | | +| `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 | v1.3.8+ | | | +| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | v2.0.3+ | | | +| `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 | v1.3.9+ | | | +| `ADDRESS_WITH_BALANCES`
    `_UPDATE_INTERVAL`| | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 | v1.3.9+ | | | +| `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer | (empty) | v1.3.0+ | | | +| `COINMARKETCAP_PAGES` | | the number of pages on coinmarketcap to list in order to find token's price | 10 | v1.3.10+ | | master | +| `SUPPORTED_CHAINS` | | Array of supported chains that displays in the footer and in the chains dropdown. This var was introduced in this PR [#1900](https://github.com/poanetwork/blockscout/pull/1900) and looks like an array of JSON objects. | (empty) | v2.0.0+ | | | +| `BLOCK_COUNT_CACHE_PERIOD ` | | time to live of cache in seconds. This var was introduced in [#1876](https://github.com/poanetwork/blockscout/pull/1876) | 600 | v2.0.0+ | | | +| `ALLOWED_EVM_VERSIONS ` | | the comma-separated list of allowed EVM versions for contracts verification. This var was introduced in [#1964](https://github.com/poanetwork/blockscout/pull/1964) | "homestead, tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg" | v2.0.0+ | | | +| `AVERAGE_BLOCK_CACHE_PERIOD` | | Update of average block cache, in seconds | 30 minutes | v2.0.2+ | | +| `MARKET_HISTORY_CACHE_PERIOD` | | Update of market history cache, in seconds | 6 hours | v2.0.2+ | | +| `DISABLE_WEBAPP` | | If `true`, endpoints to webapp are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | | +| `DISABLE_READ_API` | | If `true`, read-only endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | | +| `DISABLE_WRITE_API` | | If `true`, write endpoints to API are hidden (compile-time) | `false` | v2.0.3+ | :white_check_mark: | | +| `DISABLE_INDEXER` | | If `true`, indexer application doesn't run | `false` | v2.0.3+ | :white_check_mark: | | +| `WEBAPP_URL` | | Link to web application instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | | +| `API_URL` | | Link to API instance, e.g. `http://host/path` | (empty) | v2.0.3+ | | | +| `CHAIN_SPEC_PATH` | | Chain specification path (absolute file system path or url) to import block emission reward ranges and genesis account balances from | (empty) | master | | | +| `COIN_GECKO_ID` | | CoinGecko coin id required for fetching an exchange rate | poa-network | master | | | From e40786a9bbec5212e884d3eec53bb93637ff5881 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 13:32:12 +0300 Subject: [PATCH 271/290] mock actual request --- .../source/token_bridge_test.exs | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs index 078c280fda..febb9e7722 100644 --- a/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs +++ b/apps/explorer/test/explorer/exchange_rates/source/token_bridge_test.exs @@ -1,14 +1,41 @@ defmodule Explorer.ExchangeRates.Source.TokenBridgeTest do use Explorer.DataCase + + alias Explorer.ExchangeRates.Source.CoinGecko alias Explorer.ExchangeRates.Source.TokenBridge alias Explorer.ExchangeRates.Token + alias Plug.Conn @json "#{File.cwd!()}/test/support/fixture/exchange_rates/coin_gecko.json" |> File.read!() |> Jason.decode!() + @json_btc_price """ + { + "rates": { + "usd": { + "name": "US Dollar", + "unit": "$", + "value": 6547.418, + "type": "fiat" + } + } + } + """ + describe "format_data/1" do - test "bring a list with one %Token{}" do + setup do + bypass = Bypass.open() + Application.put_env(:explorer, CoinGecko, base_url: "http://localhost:#{bypass.port}") + + {:ok, bypass: bypass} + end + + test "bring a list with one %Token{}", %{bypass: bypass} do + Bypass.expect(bypass, "GET", "/exchange_rates", fn conn -> + Conn.resp(conn, 200, @json_btc_price) + end) + assert [%Token{}] = TokenBridge.format_data(@json) end end From 2db7702cef68d187a1662cdf8457aacaed066a6a Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 28 Aug 2019 14:29:58 +0300 Subject: [PATCH 272/290] Add scheme in api base url --- .../templates/api_docs/eth_rpc.html.eex | 2 +- .../templates/api_docs/index.html.eex | 2 +- .../block_scout_web/views/api_docs_view.ex | 26 ++++---- .../views/api_docs_view_test.exs | 64 +++++++++++++------ 4 files changed, 58 insertions(+), 36 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex index 7b8a9a98de..ad27e68185 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex @@ -2,7 +2,7 @@

    <%= gettext("ETH RPC API Documentation") %>

    -

    [ <%= gettext "Base URL:" %> <%= eth_rpc_api_url()%> ]

    +

    [ <%= gettext "Base URL:" %> <%= eth_rpc_api_url(with_scheme: true)%> ]

    <%= gettext "This API is provided to support some rpc methods in the exact format specified for ethereum nodes, which can be found " %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex index 59dae38cdb..10ff5a6c27 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex @@ -2,7 +2,7 @@

    <%= gettext("API Documentation") %>

    -

    [ <%= gettext "Base URL:" %> <%= api_url()%> ]

    +

    [ <%= gettext "Base URL:" %> <%= api_url(with_scheme: true)%> ]

    <%= gettext "This API is provided for developers transitioning their applications from Etherscan to BlockScout. It supports GET and POST requests." %>

    diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index 6f731d3627..c30364e96b 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -34,30 +34,30 @@ defmodule BlockScoutWeb.APIDocsView do end) end - def blockscout_url do + defp blockscout_url(opts) do url_params = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url] host = url_params[:host] path = url_params[:path] + scheme = + if Keyword.get(opts, :with_scheme, false) do + url_params[:scheme] <> "://" + end if host != "localhost" do - "#{host}#{path}" + "#{scheme}#{host}#{path}" else port = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:http][:port] - "#{host}:#{to_string(port)}" + "#{scheme}#{host}:#{to_string(port)}" end end - def api_url do - handle_slash("api") + def api_url(opts \\ []) do + base_url = blockscout_url(opts) + Path.join(base_url, "api") end - def eth_rpc_api_url do - handle_slash("api/eth_rpc") - end - - defp handle_slash(path) do - base_url = blockscout_url() - - Path.join(base_url, path) + def eth_rpc_api_url(opts \\ []) do + base_url = blockscout_url(opts) + Path.join(base_url, "api/eth_rpc") end end diff --git a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs index 69be27ef09..bd2bb6cd05 100644 --- a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do alias BlockScoutWeb.APIDocsView - describe "blockscout_url/0" do + describe "api_url/1" do setup do original = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint) @@ -12,46 +12,44 @@ defmodule BlockScoutWeb.ApiDocsViewTest do :ok end - test "returns url with scheme and host without port" do + test "adds slash before path" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/"] + url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.blockscout_url() == "blockscout.com/" + assert APIDocsView.api_url() == "blockscout.com/chain/dog/api" end - test "returns url with scheme and host with path" do + test "does not add slash to empty path" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] + url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] ) - assert APIDocsView.blockscout_url() == "blockscout.com/chain/dog" + assert APIDocsView.api_url() == "blockscout.com/api" end - end - describe "api_url/1" do - setup do - original = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint) - - on_exit(fn -> Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, original) end) + test "path with schems" do + Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, + url: [scheme: "https", host: "blockscout.com", port: 9999] + ) - :ok - end + assert APIDocsView.api_url(with_scheme: true) == "https://blockscout.com/api" - test "adds slash before path" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] + url: [scheme: "http", host: "blockscout.com", port: 9999] ) - assert APIDocsView.api_url() == "blockscout.com/chain/dog/api" + assert APIDocsView.api_url(with_scheme: true) == "http://blockscout.com/api" end - test "does not add slash to empty path" do + test "localhost return with port" do Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] + url: [scheme: "http", host: "localhost"], + http: [port: 9999] ) - assert APIDocsView.api_url() == "blockscout.com/api" + assert APIDocsView.api_url() == "localhost:9999/api" + assert APIDocsView.api_url(with_scheme: true) == "http://localhost:9999/api" end end @@ -79,5 +77,29 @@ defmodule BlockScoutWeb.ApiDocsViewTest do assert APIDocsView.eth_rpc_api_url() == "blockscout.com/api/eth_rpc" end + + test "path with schems" do + Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, + url: [scheme: "https", host: "blockscout.com", port: 9999] + ) + + assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "https://blockscout.com/api/eth_rpc" + + Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, + url: [scheme: "http", host: "blockscout.com", port: 9999] + ) + + assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "http://blockscout.com/api/eth_rpc" + end + + test "localhost return with port" do + Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, + url: [scheme: "http", host: "localhost"], + http: [port: 9999] + ) + + assert APIDocsView.eth_rpc_api_url() == "localhost:9999/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "http://localhost:9999/api/eth_rpc" + end end end From aabb0069405954d98f2ccb73d29428d5fec9233d Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 28 Aug 2019 14:36:36 +0300 Subject: [PATCH 273/290] Add host in an example of curl request --- apps/block_scout_web/assets/js/lib/try_eth_api.js | 3 ++- .../block_scout_web/lib/block_scout_web/views/api_docs_view.ex | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js index 464229885d..8f81f852ec 100644 --- a/apps/block_scout_web/assets/js/lib/try_eth_api.js +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -1,7 +1,8 @@ import $ from 'jquery' function composeCurlCommand (data) { - return `curl -H "content-type: application/json" -X POST --data '${JSON.stringify(data)}'` + const url = $('[data-endpoint-url]').attr('data-endpoint-url') + return `curl ${url} -H "content-type: application/json" -X POST --data '${JSON.stringify(data)}'` } function handleResponse (data, xhr, clickedButton) { diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index c30364e96b..a9b816abb9 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -38,6 +38,7 @@ defmodule BlockScoutWeb.APIDocsView do url_params = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url] host = url_params[:host] path = url_params[:path] + scheme = if Keyword.get(opts, :with_scheme, false) do url_params[:scheme] <> "://" From d167795623e29cd840d08b576cf0afbb2b721a2c Mon Sep 17 00:00:00 2001 From: saneery Date: Wed, 28 Aug 2019 15:19:48 +0300 Subject: [PATCH 274/290] fix test --- .../lib/block_scout_web/views/api_docs_view.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index a9b816abb9..eabd883df9 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -40,8 +40,8 @@ defmodule BlockScoutWeb.APIDocsView do path = url_params[:path] scheme = - if Keyword.get(opts, :with_scheme, false) do - url_params[:scheme] <> "://" + if Keyword.get(opts, :with_scheme, false) && url_params[:scheme] do + "#{url_params[:scheme]}://" end if host != "localhost" do From 18f545b1b87b5302e76a5cbfecb836cc9db89c10 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 15:44:57 +0300 Subject: [PATCH 275/290] fix env var description --- docs/env-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/env-variables.md b/docs/env-variables.md index 2dc8763b8d..dd01cbe26f 100644 --- a/docs/env-variables.md +++ b/docs/env-variables.md @@ -28,7 +28,7 @@ $ export NETWORK=POA | `SECRET_KEY_BASE` | :white_check_mark: | Use mix phx.gen.secret to generate a new Secret Key Base string to protect production assets. | (empty) | all | | | | `CHECK_ORIGIN` | | Used to check the origin of requests when the origin header is present. It defaults to false. In case of true, it will check against the host value. | false | all | | | | `PORT` | :white_check_mark: | Default port the application runs on is 4000 | 4000 | all | | | -| `COIN` | :white_check_mark: | The coin here is checked via the Coinmarketcap API to obtain USD prices on graphs and other areas of the UI | POA | all | | | +| `COIN` | :white_check_mark: | The coin here is checked via the CoinGecko API to obtain USD prices on graphs and other areas of the UI | POA | all | | | | `METADATA_CONTRACT` | | This environment variable is specifically used by POA Network to obtain Validators information to display in the UI. | (empty) | all | | | | `VALIDATORS_CONTRACT` | | This environment variable is specifically used by POA Network to obtain the Emission Fund contract. | (empty) | all | | | | `SUPPLY_MODULE` | | This environment variable is used by the xDai Chain in order to tell the application how to calculate the total supply of the chain. | false | all | | | From 3c0540102c0c09fd645d0c2e5365b6e204bb1287 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 28 Aug 2019 15:50:58 +0300 Subject: [PATCH 276/290] checkout package-lock.json from origin/master --- apps/block_scout_web/assets/package-lock.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 1565a96a74..2c78f45f55 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4555,6 +4555,7 @@ "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4772,7 +4773,8 @@ "safe-buffer": { "version": "5.1.1", "resolved": false, - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4875,7 +4877,8 @@ "yallist": { "version": "3.0.2", "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", + "optional": true } } }, @@ -5986,7 +5989,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -6188,7 +6191,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, From d40aaef0c6c889986cf81c77c76ed66601b8de01 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 29 Aug 2019 10:28:39 +0300 Subject: [PATCH 277/290] Add scheme in api urls --- .../templates/api_docs/eth_rpc.html.eex | 2 +- .../templates/api_docs/index.html.eex | 2 +- .../block_scout_web/views/api_docs_view.ex | 20 ++++----- .../views/api_docs_view_test.exs | 42 +++---------------- 4 files changed, 16 insertions(+), 50 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex index ad27e68185..7b8a9a98de 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex @@ -2,7 +2,7 @@

    <%= gettext("ETH RPC API Documentation") %>

    -

    [ <%= gettext "Base URL:" %> <%= eth_rpc_api_url(with_scheme: true)%> ]

    +

    [ <%= gettext "Base URL:" %> <%= eth_rpc_api_url()%> ]

    <%= gettext "This API is provided to support some rpc methods in the exact format specified for ethereum nodes, which can be found " %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex index 10ff5a6c27..59dae38cdb 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex @@ -2,7 +2,7 @@

    <%= gettext("API Documentation") %>

    -

    [ <%= gettext "Base URL:" %> <%= api_url(with_scheme: true)%> ]

    +

    [ <%= gettext "Base URL:" %> <%= api_url()%> ]

    <%= gettext "This API is provided for developers transitioning their applications from Etherscan to BlockScout. It supports GET and POST requests." %>

    diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index eabd883df9..e067c997d2 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -34,31 +34,27 @@ defmodule BlockScoutWeb.APIDocsView do end) end - defp blockscout_url(opts) do + defp blockscout_url do url_params = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:url] host = url_params[:host] path = url_params[:path] - - scheme = - if Keyword.get(opts, :with_scheme, false) && url_params[:scheme] do - "#{url_params[:scheme]}://" - end + scheme = Keyword.get(url_params, :scheme, "http") if host != "localhost" do - "#{scheme}#{host}#{path}" + "#{scheme}://#{host}#{path}" else port = Application.get_env(:block_scout_web, BlockScoutWeb.Endpoint)[:http][:port] - "#{scheme}#{host}:#{to_string(port)}" + "#{scheme}://#{host}:#{to_string(port)}" end end - def api_url(opts \\ []) do - base_url = blockscout_url(opts) + def api_url do + base_url = blockscout_url() Path.join(base_url, "api") end - def eth_rpc_api_url(opts \\ []) do - base_url = blockscout_url(opts) + def eth_rpc_api_url do + base_url = blockscout_url() Path.join(base_url, "api/eth_rpc") end end diff --git a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs index bd2bb6cd05..31922b4486 100644 --- a/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/api_docs_view_test.exs @@ -17,7 +17,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.api_url() == "blockscout.com/chain/dog/api" + assert APIDocsView.api_url() == "https://blockscout.com/chain/dog/api" end test "does not add slash to empty path" do @@ -25,21 +25,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] ) - assert APIDocsView.api_url() == "blockscout.com/api" - end - - test "path with schems" do - Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999] - ) - - assert APIDocsView.api_url(with_scheme: true) == "https://blockscout.com/api" - - Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "http", host: "blockscout.com", port: 9999] - ) - - assert APIDocsView.api_url(with_scheme: true) == "http://blockscout.com/api" + assert APIDocsView.api_url() == "https://blockscout.com/api" end test "localhost return with port" do @@ -48,8 +34,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do http: [port: 9999] ) - assert APIDocsView.api_url() == "localhost:9999/api" - assert APIDocsView.api_url(with_scheme: true) == "http://localhost:9999/api" + assert APIDocsView.api_url() == "http://localhost:9999/api" end end @@ -67,7 +52,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: "/chain/dog"] ) - assert APIDocsView.eth_rpc_api_url() == "blockscout.com/chain/dog/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url() == "https://blockscout.com/chain/dog/api/eth_rpc" end test "does not add slash to empty path" do @@ -75,21 +60,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do url: [scheme: "https", host: "blockscout.com", port: 9999, path: ""] ) - assert APIDocsView.eth_rpc_api_url() == "blockscout.com/api/eth_rpc" - end - - test "path with schems" do - Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "https", host: "blockscout.com", port: 9999] - ) - - assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "https://blockscout.com/api/eth_rpc" - - Application.put_env(:block_scout_web, BlockScoutWeb.Endpoint, - url: [scheme: "http", host: "blockscout.com", port: 9999] - ) - - assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "http://blockscout.com/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url() == "https://blockscout.com/api/eth_rpc" end test "localhost return with port" do @@ -98,8 +69,7 @@ defmodule BlockScoutWeb.ApiDocsViewTest do http: [port: 9999] ) - assert APIDocsView.eth_rpc_api_url() == "localhost:9999/api/eth_rpc" - assert APIDocsView.eth_rpc_api_url(with_scheme: true) == "http://localhost:9999/api/eth_rpc" + assert APIDocsView.eth_rpc_api_url() == "http://localhost:9999/api/eth_rpc" end end end From 37da2eaa6e5500b493e892e2c4da8358ba52d6a6 Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 29 Aug 2019 10:30:05 +0300 Subject: [PATCH 278/290] Move api's url to the end of example --- apps/block_scout_web/assets/js/lib/try_eth_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js index 8f81f852ec..c59d71dbcc 100644 --- a/apps/block_scout_web/assets/js/lib/try_eth_api.js +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -2,7 +2,7 @@ import $ from 'jquery' function composeCurlCommand (data) { const url = $('[data-endpoint-url]').attr('data-endpoint-url') - return `curl ${url} -H "content-type: application/json" -X POST --data '${JSON.stringify(data)}'` + return `curl -H "content-type: application/json" -X POST --data '${JSON.stringify(data)}' ${url}` } function handleResponse (data, xhr, clickedButton) { From a86b95cbe6c72eb33b496343eca196c66abd2c0a Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 29 Aug 2019 10:35:37 +0300 Subject: [PATCH 279/290] Use pipeline --- .../lib/block_scout_web/views/api_docs_view.ex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex index e067c997d2..363a4a0179 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api_docs_view.ex @@ -49,12 +49,12 @@ defmodule BlockScoutWeb.APIDocsView do end def api_url do - base_url = blockscout_url() - Path.join(base_url, "api") + blockscout_url() + |> Path.join("api") end def eth_rpc_api_url do - base_url = blockscout_url() - Path.join(base_url, "api/eth_rpc") + blockscout_url() + |> Path.join("api/eth_rpc") end end From 3b3018f663e4efc95e9836e16b1eb2be8f9478d0 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Thu, 29 Aug 2019 12:55:23 +0200 Subject: [PATCH 280/290] Added Xerom to list of Additional Chains using BlockScout. --- README.md | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 3c95a5d125..13c50fd838 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ BlockScout provides a comprehensive, easy-to-use interface for users to view, co See our [project documentation](https://poanetwork.github.io/blockscout) for detailed information and setup instructions. -Visit the [POA BlockScout forum](https://forum.poa.network/c/blockscout) for FAQs, troubleshooting, and other BlockScout related items. You can also post and answer questions here. +Visit the [POA BlockScout forum](https://forum.poa.network/c/blockscout) for FAQs, troubleshooting, and other BlockScout related items. You can also post and answer questions here. -You can also access the dev chatroom on our [Gitter Channel](https://gitter.im/poanetwork/blockscout). +You can also access the dev chatroom on our [Gitter Channel](https://gitter.im/poanetwork/blockscout). ## About BlockScout @@ -28,33 +28,33 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc ## Supported Projects -| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | -|--------------------------------------------------------|-------------------------------------------------------|----------------------------------------------------| -| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | -| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | -| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | -| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | -| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | -| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | -| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | -| | | [SpringChain](https://explorer.springrole.com/) | -| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | -| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | -| | | [Tenda](https://tenda.network) | -| | | [GoJoy Chain](https://gojoychain.com/) | - - -Current BlockScout versions for hosted projects are available [on the forum](https://forum.poa.network/t/deployed-instances-on-blockscout-com/1938). +| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | +| ------------------------------------------------------ | ----------------------------------------------------- | ---------------------------------------------------- | +| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | +| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | +| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | +| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | +| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | +| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | +| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | +| | | [SpringChain](https://explorer.springrole.com/) | +| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | +| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | +| | | [Tenda](https://tenda.network) | +| | | [GoJoy Chain](https://gojoychain.com/) | +| | | [Xerom](https://blocks.xerom.org/) | + +Current BlockScout versions for hosted projects are available [on the forum](https://forum.poa.network/t/deployed-instances-on-blockscout-com/1938). ## Getting Started See the [project documentation](https://poanetwork.github.io/blockscout) for instructions: -- [Requirements](https://poanetwork.github.io/blockscout/#/requirements) -- [Ansible deployment](https://poanetwork.github.io/blockscout/#/ansible-deployment) -- [Manual deployment](https://poanetwork.github.io/blockscout/#/manual-deployment) -- [ENV variables](https://poanetwork.github.io/blockscout/#/env-variables) -- [Configuration options](https://poanetwork.github.io/blockscout/#/dev-env) +- [Requirements](https://poanetwork.github.io/blockscout/#/requirements) +- [Ansible deployment](https://poanetwork.github.io/blockscout/#/ansible-deployment) +- [Manual deployment](https://poanetwork.github.io/blockscout/#/manual-deployment) +- [ENV variables](https://poanetwork.github.io/blockscout/#/env-variables) +- [Configuration options](https://poanetwork.github.io/blockscout/#/dev-env) ## Acknowledgements From 7f0042b2b70e4359b556c78d13106a6bd7e0cef7 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Thu, 29 Aug 2019 13:02:27 +0200 Subject: [PATCH 281/290] Added PR --- CHANGELOG.md | 854 ++++++++++++++++++++++++++------------------------- 1 file changed, 428 insertions(+), 426 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e345f9216d..971696703b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,572 +1,574 @@ ## Current ### Features -- [#2555](https://github.com/poanetwork/blockscout/pull/2555) - find and show decoding candidates for logs -- [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type -- [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method -- [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges -- [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation + +- [#2555](https://github.com/poanetwork/blockscout/pull/2555) - find and show decoding candidates for logs +- [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type +- [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method +- [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges +- [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes -- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons -- [#2635](https://github.com/poanetwork/blockscout/pull/2635) - optimize ERC721 inventory query -- [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues -- [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test -- [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta -- [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint -- [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper -- [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css -- [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload -- [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter -- [#2568](https://github.com/poanetwork/blockscout/pull/2568) - filter pending token transfers -- [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs -- [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button -- [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records + +- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons +- [#2635](https://github.com/poanetwork/blockscout/pull/2635) - optimize ERC721 inventory query +- [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues +- [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test +- [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta +- [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint +- [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper +- [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css +- [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload +- [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter +- [#2568](https://github.com/poanetwork/blockscout/pull/2568) - filter pending token transfers +- [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs +- [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button +- [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore -- [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown -- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities -- [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted -- [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically -- [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases -- [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table -- [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error -- [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix +- [#2646](https://github.com/poanetwork/blockscout/pull/2646) - Added Xerom to list of Additional Chains using BlockScout +- [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown +- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities +- [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted +- [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically +- [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases +- [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table +- [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error +- [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix ## 2.0.3-beta ### Features -- [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation -- [#2529](https://github.com/poanetwork/blockscout/pull/2529) - show both eth value and token transfers on transaction overview page -- [#2376](https://github.com/poanetwork/blockscout/pull/2376) - Split API and WebApp routes -- [#2477](https://github.com/poanetwork/blockscout/pull/2477) - aggregate token transfers on transaction page -- [#2458](https://github.com/poanetwork/blockscout/pull/2458) - Add LAST_BLOCK var to add ability indexing in the range of blocks -- [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth -- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method + +- [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation +- [#2529](https://github.com/poanetwork/blockscout/pull/2529) - show both eth value and token transfers on transaction overview page +- [#2376](https://github.com/poanetwork/blockscout/pull/2376) - Split API and WebApp routes +- [#2477](https://github.com/poanetwork/blockscout/pull/2477) - aggregate token transfers on transaction page +- [#2458](https://github.com/poanetwork/blockscout/pull/2458) - Add LAST_BLOCK var to add ability indexing in the range of blocks +- [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth +- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method ### Fixes -- [#2562](https://github.com/poanetwork/blockscout/pull/2562) - Fix dark theme flickering -- [#2560](https://github.com/poanetwork/blockscout/pull/2560) - fix slash before not empty path in docs -- [#2559](https://github.com/poanetwork/blockscout/pull/2559) - fix rsk total supply for empty exchange rate -- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass -- [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend -- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip -- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox -- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page -- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search -- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles -- [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page -- [#2528](https://github.com/poanetwork/blockscout/pull/2528) - fix coin history chart data -- [#2520](https://github.com/poanetwork/blockscout/pull/2520) - Hide loading message when fetching is failed -- [#2523](https://github.com/poanetwork/blockscout/pull/2523) - Avoid importing internal_transactions of pending transactions -- [#2519](https://github.com/poanetwork/blockscout/pull/2519) - enable `First` page button in pagination -- [#2518](https://github.com/poanetwork/blockscout/pull/2518) - create suggested indexes -- [#2517](https://github.com/poanetwork/blockscout/pull/2517) - remove duplicate indexes -- [#2515](https://github.com/poanetwork/blockscout/pull/2515) - do not aggregate NFT token transfers -- [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css -- [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix -- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps fix -- [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix -- [#2506](https://github.com/poanetwork/blockscout/pull/2506) - fix two active tab in the top menu -- [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance -- [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout -- [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes -- [#2496](https://github.com/poanetwork/blockscout/pull/2496) - fix docker build -- [#2495](https://github.com/poanetwork/blockscout/pull/2495) - fix logs for indexed chain -- [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query -- [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB -- [#2551](https://github.com/poanetwork/blockscout/pull/2551) - Correctly handle dynamically created Bootstrap tooltips + +- [#2562](https://github.com/poanetwork/blockscout/pull/2562) - Fix dark theme flickering +- [#2560](https://github.com/poanetwork/blockscout/pull/2560) - fix slash before not empty path in docs +- [#2559](https://github.com/poanetwork/blockscout/pull/2559) - fix rsk total supply for empty exchange rate +- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass +- [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend +- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip +- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox +- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page +- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search +- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles +- [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page +- [#2528](https://github.com/poanetwork/blockscout/pull/2528) - fix coin history chart data +- [#2520](https://github.com/poanetwork/blockscout/pull/2520) - Hide loading message when fetching is failed +- [#2523](https://github.com/poanetwork/blockscout/pull/2523) - Avoid importing internal_transactions of pending transactions +- [#2519](https://github.com/poanetwork/blockscout/pull/2519) - enable `First` page button in pagination +- [#2518](https://github.com/poanetwork/blockscout/pull/2518) - create suggested indexes +- [#2517](https://github.com/poanetwork/blockscout/pull/2517) - remove duplicate indexes +- [#2515](https://github.com/poanetwork/blockscout/pull/2515) - do not aggregate NFT token transfers +- [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css +- [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix +- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps fix +- [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix +- [#2506](https://github.com/poanetwork/blockscout/pull/2506) - fix two active tab in the top menu +- [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance +- [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout +- [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes +- [#2496](https://github.com/poanetwork/blockscout/pull/2496) - fix docker build +- [#2495](https://github.com/poanetwork/blockscout/pull/2495) - fix logs for indexed chain +- [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query +- [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB +- [#2551](https://github.com/poanetwork/blockscout/pull/2551) - Correctly handle dynamically created Bootstrap tooltips ### Chore -- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs -- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage -- [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload -- [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork -- [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings -- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 -- [#2492](https://github.com/poanetwork/blockscout/pull/2492) - hide decoded row if event is not decoded -- [#2490](https://github.com/poanetwork/blockscout/pull/2490) - enable credo duplicated code check -- [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version -- [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock -- [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin -- [#2450](https://github.com/poanetwork/blockscout/pull/2450) - Fix clearance of logs and node_modules folders in clearing script -- [#2434](https://github.com/poanetwork/blockscout/pull/2434) - get rid of timex warnings -- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 -- [#2373](https://github.com/poanetwork/blockscout/pull/2373) - Add script to validate internal_transactions constraint for large DBs +- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs +- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage +- [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload +- [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork +- [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings +- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 +- [#2492](https://github.com/poanetwork/blockscout/pull/2492) - hide decoded row if event is not decoded +- [#2490](https://github.com/poanetwork/blockscout/pull/2490) - enable credo duplicated code check +- [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version +- [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock +- [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin +- [#2450](https://github.com/poanetwork/blockscout/pull/2450) - Fix clearance of logs and node_modules folders in clearing script +- [#2434](https://github.com/poanetwork/blockscout/pull/2434) - get rid of timex warnings +- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 +- [#2373](https://github.com/poanetwork/blockscout/pull/2373) - Add script to validate internal_transactions constraint for large DBs ## 2.0.2-beta ### Features -- [#2412](https://github.com/poanetwork/blockscout/pull/2412) - dark theme -- [#2399](https://github.com/poanetwork/blockscout/pull/2399) - decode verified smart contract's logs -- [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements -- [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty -- [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts -- [#2366](https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs -- [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification -- [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions -- [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint -- [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page + +- [#2412](https://github.com/poanetwork/blockscout/pull/2412) - dark theme +- [#2399](https://github.com/poanetwork/blockscout/pull/2399) - decode verified smart contract's logs +- [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements +- [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty +- [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts +- [#2366](https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs +- [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification +- [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions +- [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint +- [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page ### Fixes -- [#2421](https://github.com/poanetwork/blockscout/pull/2421) - Fix hiding of loader for txs on the main page -- [#2420](https://github.com/poanetwork/blockscout/pull/2420) - fetch data from cache in healthy endpoint -- [#2416](https://github.com/poanetwork/blockscout/pull/2416) - Fix "page not found" handling in the router -- [#2413](https://github.com/poanetwork/blockscout/pull/2413) - remove outer tables for decoded data -- [#2410](https://github.com/poanetwork/blockscout/pull/2410) - preload smart contract for logs decoding -- [#2405](https://github.com/poanetwork/blockscout/pull/2405) - added templates for table loader and tile loader -- [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate -- [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used) -- [#2388](https://github.com/poanetwork/blockscout/pull/2388) - add create2 support to geth's js tracer -- [#2387](https://github.com/poanetwork/blockscout/pull/2387) - fix not existing keys in transaction json rpc -- [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css -- [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info -- [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict -- [#2346](https://github.com/poanetwork/blockscout/pull/2346) - Avoid fetching internal transactions of blocks that still need refetching -- [#2350](https://github.com/poanetwork/blockscout/pull/2350) - fix invalid User agent headers -- [#2345](https://github.com/poanetwork/blockscout/pull/2345) - do not override existing market records -- [#2337](https://github.com/poanetwork/blockscout/pull/2337) - set url params for prod explicitly -- [#2341](https://github.com/poanetwork/blockscout/pull/2341) - fix transaction input json encoding -- [#2311](https://github.com/poanetwork/blockscout/pull/2311) - fix market history overriding with zeroes -- [#2310](https://github.com/poanetwork/blockscout/pull/2310) - parse url for api docs -- [#2299](https://github.com/poanetwork/blockscout/pull/2299) - fix interpolation in error message -- [#2303](https://github.com/poanetwork/blockscout/pull/2303) - fix transaction csv download link -- [#2304](https://github.com/poanetwork/blockscout/pull/2304) - footer grid fix for md resolution -- [#2291](https://github.com/poanetwork/blockscout/pull/2291) - dashboard fix for md resolution, transactions load fix, block info row fix, addresses page issue, check mark issue -- [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments + +- [#2421](https://github.com/poanetwork/blockscout/pull/2421) - Fix hiding of loader for txs on the main page +- [#2420](https://github.com/poanetwork/blockscout/pull/2420) - fetch data from cache in healthy endpoint +- [#2416](https://github.com/poanetwork/blockscout/pull/2416) - Fix "page not found" handling in the router +- [#2413](https://github.com/poanetwork/blockscout/pull/2413) - remove outer tables for decoded data +- [#2410](https://github.com/poanetwork/blockscout/pull/2410) - preload smart contract for logs decoding +- [#2405](https://github.com/poanetwork/blockscout/pull/2405) - added templates for table loader and tile loader +- [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate +- [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used) +- [#2388](https://github.com/poanetwork/blockscout/pull/2388) - add create2 support to geth's js tracer +- [#2387](https://github.com/poanetwork/blockscout/pull/2387) - fix not existing keys in transaction json rpc +- [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css +- [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info +- [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict +- [#2346](https://github.com/poanetwork/blockscout/pull/2346) - Avoid fetching internal transactions of blocks that still need refetching +- [#2350](https://github.com/poanetwork/blockscout/pull/2350) - fix invalid User agent headers +- [#2345](https://github.com/poanetwork/blockscout/pull/2345) - do not override existing market records +- [#2337](https://github.com/poanetwork/blockscout/pull/2337) - set url params for prod explicitly +- [#2341](https://github.com/poanetwork/blockscout/pull/2341) - fix transaction input json encoding +- [#2311](https://github.com/poanetwork/blockscout/pull/2311) - fix market history overriding with zeroes +- [#2310](https://github.com/poanetwork/blockscout/pull/2310) - parse url for api docs +- [#2299](https://github.com/poanetwork/blockscout/pull/2299) - fix interpolation in error message +- [#2303](https://github.com/poanetwork/blockscout/pull/2303) - fix transaction csv download link +- [#2304](https://github.com/poanetwork/blockscout/pull/2304) - footer grid fix for md resolution +- [#2291](https://github.com/poanetwork/blockscout/pull/2291) - dashboard fix for md resolution, transactions load fix, block info row fix, addresses page issue, check mark issue +- [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments ### Chore -- [#2422](https://github.com/poanetwork/blockscout/pull/2422) - check if address_id is binary in token_transfers_csv endpoint -- [#2418](https://github.com/poanetwork/blockscout/pull/2418) - Remove parentheses in market cap percentage -- [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache -- [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc -- [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup -- [#2325](https://github.com/poanetwork/blockscout/pull/2325) - Reduce function input to address' hash only where possible -- [#2323](https://github.com/poanetwork/blockscout/pull/2323) - Group Explorer caches -- [#2305](https://github.com/poanetwork/blockscout/pull/2305) - Improve Address controllers -- [#2302](https://github.com/poanetwork/blockscout/pull/2302) - fix names for xDai source -- [#2289](https://github.com/poanetwork/blockscout/pull/2289) - Optional websockets for dev environment -- [#2307](https://github.com/poanetwork/blockscout/pull/2307) - add GoJoy to README -- [#2293](https://github.com/poanetwork/blockscout/pull/2293) - remove request idle timeout configuration -- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - bump elixir version to 1.9.0 +- [#2422](https://github.com/poanetwork/blockscout/pull/2422) - check if address_id is binary in token_transfers_csv endpoint +- [#2418](https://github.com/poanetwork/blockscout/pull/2418) - Remove parentheses in market cap percentage +- [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache +- [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc +- [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup +- [#2325](https://github.com/poanetwork/blockscout/pull/2325) - Reduce function input to address' hash only where possible +- [#2323](https://github.com/poanetwork/blockscout/pull/2323) - Group Explorer caches +- [#2305](https://github.com/poanetwork/blockscout/pull/2305) - Improve Address controllers +- [#2302](https://github.com/poanetwork/blockscout/pull/2302) - fix names for xDai source +- [#2289](https://github.com/poanetwork/blockscout/pull/2289) - Optional websockets for dev environment +- [#2307](https://github.com/poanetwork/blockscout/pull/2307) - add GoJoy to README +- [#2293](https://github.com/poanetwork/blockscout/pull/2293) - remove request idle timeout configuration +- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - bump elixir version to 1.9.0 ## 2.0.1-beta ### Features -- [#2283](https://github.com/poanetwork/blockscout/pull/2283) - Add transactions cache -- [#2182](https://github.com/poanetwork/blockscout/pull/2182) - add market history cache -- [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch -- [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache -- [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty -- [#2191](https://github.com/poanetwork/blockscout/pull/2191) - allow to configure token metadata update interval -- [#2146](https://github.com/poanetwork/blockscout/pull/2146) - feat: add eth_getLogs rpc endpoint -- [#2216](https://github.com/poanetwork/blockscout/pull/2216) - Improve token's controllers by avoiding unnecessary preloads -- [#2235](https://github.com/poanetwork/blockscout/pull/2235) - save and show additional validation fields to smart contract -- [#2190](https://github.com/poanetwork/blockscout/pull/2190) - show all token transfers -- [#2193](https://github.com/poanetwork/blockscout/pull/2193) - feat: add BLOCKSCOUT_HOST, and use it in API docs -- [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation + +- [#2283](https://github.com/poanetwork/blockscout/pull/2283) - Add transactions cache +- [#2182](https://github.com/poanetwork/blockscout/pull/2182) - add market history cache +- [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch +- [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache +- [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty +- [#2191](https://github.com/poanetwork/blockscout/pull/2191) - allow to configure token metadata update interval +- [#2146](https://github.com/poanetwork/blockscout/pull/2146) - feat: add eth_getLogs rpc endpoint +- [#2216](https://github.com/poanetwork/blockscout/pull/2216) - Improve token's controllers by avoiding unnecessary preloads +- [#2235](https://github.com/poanetwork/blockscout/pull/2235) - save and show additional validation fields to smart contract +- [#2190](https://github.com/poanetwork/blockscout/pull/2190) - show all token transfers +- [#2193](https://github.com/poanetwork/blockscout/pull/2193) - feat: add BLOCKSCOUT_HOST, and use it in API docs +- [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation ### Fixes -- [#2290](https://github.com/poanetwork/blockscout/pull/2290) - Add eth_get_balance.json to AddressView's render -- [#2286](https://github.com/poanetwork/blockscout/pull/2286) - banner stats issues on sm resolutions, transactions title issue -- [#2284](https://github.com/poanetwork/blockscout/pull/2284) - add 404 status for not existing pages -- [#2244](https://github.com/poanetwork/blockscout/pull/2244) - fix internal transactions failing to be indexed because of constraint -- [#2281](https://github.com/poanetwork/blockscout/pull/2281) - typo issues, dropdown issues -- [#2278](https://github.com/poanetwork/blockscout/pull/2278) - increase threshold for scientific notation -- [#2275](https://github.com/poanetwork/blockscout/pull/2275) - Description for networks selector -- [#2263](https://github.com/poanetwork/blockscout/pull/2263) - added an ability to close network selector on outside click -- [#2257](https://github.com/poanetwork/blockscout/pull/2257) - 'download csv' button added to different tabs -- [#2242](https://github.com/poanetwork/blockscout/pull/2242) - added styles for 'download csv' button -- [#2261](https://github.com/poanetwork/blockscout/pull/2261) - header logo aligned to the center properly -- [#2254](https://github.com/poanetwork/blockscout/pull/2254) - search length issue, tile link wrapping issue -- [#2238](https://github.com/poanetwork/blockscout/pull/2238) - header content alignment issue, hide navbar on outside click -- [#2229](https://github.com/poanetwork/blockscout/pull/2229) - gap issue between qr and copy button in token transfers, top cards width and height issue -- [#2201](https://github.com/poanetwork/blockscout/pull/2201) - footer columns fix -- [#2179](https://github.com/poanetwork/blockscout/pull/2179) - fix docker build error -- [#2165](https://github.com/poanetwork/blockscout/pull/2165) - sort blocks by timestamp when calculating average block time -- [#2175](https://github.com/poanetwork/blockscout/pull/2175) - fix coinmarketcap response errors -- [#2164](https://github.com/poanetwork/blockscout/pull/2164) - fix large numbers in balance view card -- [#2155](https://github.com/poanetwork/blockscout/pull/2155) - fix pending transaction query -- [#2183](https://github.com/poanetwork/blockscout/pull/2183) - tile content aligning for mobile resolution fix, dai logo fix -- [#2162](https://github.com/poanetwork/blockscout/pull/2162) - contract creation tile color changed -- [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli -- [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli -- [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue -- [#2129](https://github.com/poanetwork/blockscout/pull/2129) - Fix for width of explorer elements -- [#2121](https://github.com/poanetwork/blockscout/pull/2121) - Binding of 404 page -- [#2120](https://github.com/poanetwork/blockscout/pull/2120) - footer links and socials focus color issue -- [#2113](https://github.com/poanetwork/blockscout/pull/2113) - renewed logos for rsk, dai, blockscout; themes color changes for lukso; error images for lukso -- [#2112](https://github.com/poanetwork/blockscout/pull/2112) - themes color improvements, dropdown color issue -- [#2110](https://github.com/poanetwork/blockscout/pull/2110) - themes colors issues, ui issues -- [#2103](https://github.com/poanetwork/blockscout/pull/2103) - ui issues for all themes -- [#2090](https://github.com/poanetwork/blockscout/pull/2090) - updated some ETC theme colors -- [#2096](https://github.com/poanetwork/blockscout/pull/2096) - RSK theme fixes -- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec -- [#2111](https://github.com/poanetwork/blockscout/pull/2111) - improve address transaction controller -- [#2108](https://github.com/poanetwork/blockscout/pull/2108) - fix uncle fetching without full transactions -- [#2128](https://github.com/poanetwork/blockscout/pull/2128) - add new function clause for uncle errors -- [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view -- [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging -- [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation -- [#2148](https://github.com/poanetwork/blockscout/pull/2148) - filter pending logs -- [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum -- [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count -- [#2177](https://github.com/poanetwork/blockscout/pull/2177) - remove duplicate entries from UncleBlock's Fetcher -- [#2169](https://github.com/poanetwork/blockscout/pull/2169) - add more validator reward types for xDai -- [#2173](https://github.com/poanetwork/blockscout/pull/2173) - handle correctly empty transactions -- [#2174](https://github.com/poanetwork/blockscout/pull/2174) - fix reward channel joining -- [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test -- [#2196](https://github.com/poanetwork/blockscout/pull/2196) - Nethermind client fixes -- [#2237](https://github.com/poanetwork/blockscout/pull/2237) - fix rsk total_supply -- [#2198](https://github.com/poanetwork/blockscout/pull/2198) - reduce transaction status and error constraint -- [#2167](https://github.com/poanetwork/blockscout/pull/2167) - feat: document eth rpc api mimicking endpoints -- [#2225](https://github.com/poanetwork/blockscout/pull/2225) - fix metadata decoding in Solidity 0.5.9 smart contract verification -- [#2204](https://github.com/poanetwork/blockscout/pull/2204) - fix large contract verification -- [#2258](https://github.com/poanetwork/blockscout/pull/2258) - reduce BlocksTransactionsMismatch memory footprint -- [#2247](https://github.com/poanetwork/blockscout/pull/2247) - hide logs search if there are no logs -- [#2248](https://github.com/poanetwork/blockscout/pull/2248) - sort block after query execution for average block time -- [#2249](https://github.com/poanetwork/blockscout/pull/2249) - More transaction controllers improvements -- [#2267](https://github.com/poanetwork/blockscout/pull/2267) - Modify implementation of `where_transaction_has_multiple_internal_transactions` -- [#2270](https://github.com/poanetwork/blockscout/pull/2270) - Remove duplicate params in `Indexer.Fetcher.TokenBalance` -- [#2268](https://github.com/poanetwork/blockscout/pull/2268) - remove not existing assigns in html code -- [#2276](https://github.com/poanetwork/blockscout/pull/2276) - remove port in docs + +- [#2290](https://github.com/poanetwork/blockscout/pull/2290) - Add eth_get_balance.json to AddressView's render +- [#2286](https://github.com/poanetwork/blockscout/pull/2286) - banner stats issues on sm resolutions, transactions title issue +- [#2284](https://github.com/poanetwork/blockscout/pull/2284) - add 404 status for not existing pages +- [#2244](https://github.com/poanetwork/blockscout/pull/2244) - fix internal transactions failing to be indexed because of constraint +- [#2281](https://github.com/poanetwork/blockscout/pull/2281) - typo issues, dropdown issues +- [#2278](https://github.com/poanetwork/blockscout/pull/2278) - increase threshold for scientific notation +- [#2275](https://github.com/poanetwork/blockscout/pull/2275) - Description for networks selector +- [#2263](https://github.com/poanetwork/blockscout/pull/2263) - added an ability to close network selector on outside click +- [#2257](https://github.com/poanetwork/blockscout/pull/2257) - 'download csv' button added to different tabs +- [#2242](https://github.com/poanetwork/blockscout/pull/2242) - added styles for 'download csv' button +- [#2261](https://github.com/poanetwork/blockscout/pull/2261) - header logo aligned to the center properly +- [#2254](https://github.com/poanetwork/blockscout/pull/2254) - search length issue, tile link wrapping issue +- [#2238](https://github.com/poanetwork/blockscout/pull/2238) - header content alignment issue, hide navbar on outside click +- [#2229](https://github.com/poanetwork/blockscout/pull/2229) - gap issue between qr and copy button in token transfers, top cards width and height issue +- [#2201](https://github.com/poanetwork/blockscout/pull/2201) - footer columns fix +- [#2179](https://github.com/poanetwork/blockscout/pull/2179) - fix docker build error +- [#2165](https://github.com/poanetwork/blockscout/pull/2165) - sort blocks by timestamp when calculating average block time +- [#2175](https://github.com/poanetwork/blockscout/pull/2175) - fix coinmarketcap response errors +- [#2164](https://github.com/poanetwork/blockscout/pull/2164) - fix large numbers in balance view card +- [#2155](https://github.com/poanetwork/blockscout/pull/2155) - fix pending transaction query +- [#2183](https://github.com/poanetwork/blockscout/pull/2183) - tile content aligning for mobile resolution fix, dai logo fix +- [#2162](https://github.com/poanetwork/blockscout/pull/2162) - contract creation tile color changed +- [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli +- [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli +- [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue +- [#2129](https://github.com/poanetwork/blockscout/pull/2129) - Fix for width of explorer elements +- [#2121](https://github.com/poanetwork/blockscout/pull/2121) - Binding of 404 page +- [#2120](https://github.com/poanetwork/blockscout/pull/2120) - footer links and socials focus color issue +- [#2113](https://github.com/poanetwork/blockscout/pull/2113) - renewed logos for rsk, dai, blockscout; themes color changes for lukso; error images for lukso +- [#2112](https://github.com/poanetwork/blockscout/pull/2112) - themes color improvements, dropdown color issue +- [#2110](https://github.com/poanetwork/blockscout/pull/2110) - themes colors issues, ui issues +- [#2103](https://github.com/poanetwork/blockscout/pull/2103) - ui issues for all themes +- [#2090](https://github.com/poanetwork/blockscout/pull/2090) - updated some ETC theme colors +- [#2096](https://github.com/poanetwork/blockscout/pull/2096) - RSK theme fixes +- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec +- [#2111](https://github.com/poanetwork/blockscout/pull/2111) - improve address transaction controller +- [#2108](https://github.com/poanetwork/blockscout/pull/2108) - fix uncle fetching without full transactions +- [#2128](https://github.com/poanetwork/blockscout/pull/2128) - add new function clause for uncle errors +- [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view +- [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging +- [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation +- [#2148](https://github.com/poanetwork/blockscout/pull/2148) - filter pending logs +- [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum +- [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count +- [#2177](https://github.com/poanetwork/blockscout/pull/2177) - remove duplicate entries from UncleBlock's Fetcher +- [#2169](https://github.com/poanetwork/blockscout/pull/2169) - add more validator reward types for xDai +- [#2173](https://github.com/poanetwork/blockscout/pull/2173) - handle correctly empty transactions +- [#2174](https://github.com/poanetwork/blockscout/pull/2174) - fix reward channel joining +- [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test +- [#2196](https://github.com/poanetwork/blockscout/pull/2196) - Nethermind client fixes +- [#2237](https://github.com/poanetwork/blockscout/pull/2237) - fix rsk total_supply +- [#2198](https://github.com/poanetwork/blockscout/pull/2198) - reduce transaction status and error constraint +- [#2167](https://github.com/poanetwork/blockscout/pull/2167) - feat: document eth rpc api mimicking endpoints +- [#2225](https://github.com/poanetwork/blockscout/pull/2225) - fix metadata decoding in Solidity 0.5.9 smart contract verification +- [#2204](https://github.com/poanetwork/blockscout/pull/2204) - fix large contract verification +- [#2258](https://github.com/poanetwork/blockscout/pull/2258) - reduce BlocksTransactionsMismatch memory footprint +- [#2247](https://github.com/poanetwork/blockscout/pull/2247) - hide logs search if there are no logs +- [#2248](https://github.com/poanetwork/blockscout/pull/2248) - sort block after query execution for average block time +- [#2249](https://github.com/poanetwork/blockscout/pull/2249) - More transaction controllers improvements +- [#2267](https://github.com/poanetwork/blockscout/pull/2267) - Modify implementation of `where_transaction_has_multiple_internal_transactions` +- [#2270](https://github.com/poanetwork/blockscout/pull/2270) - Remove duplicate params in `Indexer.Fetcher.TokenBalance` +- [#2268](https://github.com/poanetwork/blockscout/pull/2268) - remove not existing assigns in html code +- [#2276](https://github.com/poanetwork/blockscout/pull/2276) - remove port in docs ### Chore -- [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version -- [#2118](https://github.com/poanetwork/blockscout/pull/2118) - show only the last decompiled contract -- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - upgrade elixir version to 1.9.0 -- [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver +- [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version +- [#2118](https://github.com/poanetwork/blockscout/pull/2118) - show only the last decompiled contract +- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - upgrade elixir version to 1.9.0 +- [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver ## 2.0.0-beta ### Features -- [#2044](https://github.com/poanetwork/blockscout/pull/2044) - New network selector. -- [#2091](https://github.com/poanetwork/blockscout/pull/2091) - Added "Question" modal. -- [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme -- [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page. -- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added -- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" -- [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated -- [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue -- [#1907](https://github.com/poanetwork/blockscout/pull/1907) - dropdown color bug fix (lukso theme) and tooltip color bug fix -- [#1859](https://github.com/poanetwork/blockscout/pull/1859) - feat: show raw transaction traces -- [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc -- [#1957](https://github.com/poanetwork/blockscout/pull/1957) - Calculate stakes ratio before insert pools -- [#1956](https://github.com/poanetwork/blockscout/pull/1956) - add logs tab to address -- [#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 -- [#2036](https://github.com/poanetwork/blockscout/pull/2036) - New tables for staking pools and delegators -- [#1974](https://github.com/poanetwork/blockscout/pull/1974) - feat: previous page button logic -- [#1999](https://github.com/poanetwork/blockscout/pull/1999) - load data async on addresses page -- [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites. -- [#2040](https://github.com/poanetwork/blockscout/pull/2040) - Verification links to other explorers for ETH -- [#2037](https://github.com/poanetwork/blockscout/pull/2037) - add address logs search functionality -- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async -- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups -- [#2100](https://github.com/poanetwork/blockscout/pull/2100) - feat: eth_get_balance rpc endpoint + +- [#2044](https://github.com/poanetwork/blockscout/pull/2044) - New network selector. +- [#2091](https://github.com/poanetwork/blockscout/pull/2091) - Added "Question" modal. +- [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme +- [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page. +- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added +- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" +- [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated +- [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue +- [#1907](https://github.com/poanetwork/blockscout/pull/1907) - dropdown color bug fix (lukso theme) and tooltip color bug fix +- [#1859](https://github.com/poanetwork/blockscout/pull/1859) - feat: show raw transaction traces +- [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc +- [#1957](https://github.com/poanetwork/blockscout/pull/1957) - Calculate stakes ratio before insert pools +- [#1956](https://github.com/poanetwork/blockscout/pull/1956) - add logs tab to address +- [#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 +- [#2036](https://github.com/poanetwork/blockscout/pull/2036) - New tables for staking pools and delegators +- [#1974](https://github.com/poanetwork/blockscout/pull/1974) - feat: previous page button logic +- [#1999](https://github.com/poanetwork/blockscout/pull/1999) - load data async on addresses page +- [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites. +- [#2040](https://github.com/poanetwork/blockscout/pull/2040) - Verification links to other explorers for ETH +- [#2037](https://github.com/poanetwork/blockscout/pull/2037) - add address logs search functionality +- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async +- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups +- [#2100](https://github.com/poanetwork/blockscout/pull/2100) - feat: eth_get_balance rpc endpoint ### Fixes -- [#2228](https://github.com/poanetwork/blockscout/pull/2228) - favorites duplication issues, active radio issue -- [#2207](https://github.com/poanetwork/blockscout/pull/2207) - new 'download csv' button design -- [#2206](https://github.com/poanetwork/blockscout/pull/2206) - added styles for 'Download All Transactions as CSV' button -- [#2099](https://github.com/poanetwork/blockscout/pull/2099) - logs search input width -- [#2098](https://github.com/poanetwork/blockscout/pull/2098) - nav dropdown issue, logo size issue -- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added -- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues -- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs. -- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input -- [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added -- [#2043](https://github.com/poanetwork/blockscout/pull/2043) - Fixed modal dialog width for 'verify other explorers' -- [#2025](https://github.com/poanetwork/blockscout/pull/2025) - Added a new color to display transactions' errors. -- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue -- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes. -- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide. -- [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown. -- [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment -- [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu -- [#1868](https://github.com/poanetwork/blockscout/pull/1868) - fix: logs list endpoint performance -- [#1822](https://github.com/poanetwork/blockscout/pull/1822) - Fix style breaks in decompiled contract code view -- [#1885](https://github.com/poanetwork/blockscout/pull/1885) - highlight reserved words in decompiled code -- [#1896](https://github.com/poanetwork/blockscout/pull/1896) - re-query tokens in top nav automplete -- [#1905](https://github.com/poanetwork/blockscout/pull/1905) - fix reorgs, uncles pagination -- [#1904](https://github.com/poanetwork/blockscout/pull/1904) - fix `BLOCK_COUNT_CACHE_TTL` env var type -- [#1915](https://github.com/poanetwork/blockscout/pull/1915) - fallback to 2 latest evm versions -- [#1937](https://github.com/poanetwork/blockscout/pull/1937) - Check the presence of overlap[i] object before retrieving properties from it -- [#1960](https://github.com/poanetwork/blockscout/pull/1960) - do not remove bold text in decompiled contacts -- [#1966](https://github.com/poanetwork/blockscout/pull/1966) - fix: add fields for contract filter performance -- [#2017](https://github.com/poanetwork/blockscout/pull/2017) - fix: fix to/from filters on tx list pages -- [#2008](https://github.com/poanetwork/blockscout/pull/2008) - add new function clause for xDai network beneficiaries -- [#2009](https://github.com/poanetwork/blockscout/pull/2009) - addresses page improvements -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions -- [#2062](https://github.com/poanetwork/blockscout/pull/2062) - fix: uniq by hash, instead of transaction -- [#2052](https://github.com/poanetwork/blockscout/pull/2052) - allow bytes32 for name and symbol -- [#2047](https://github.com/poanetwork/blockscout/pull/2047) - fix: show creating internal transactions -- [#2014](https://github.com/poanetwork/blockscout/pull/2014) - fix: use better queries for listLogs endpoint -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions -- [#2070](https://github.com/poanetwork/blockscout/pull/2070) - reduce `max_concurrency` of `BlocksTransactionsMismatch` fetcher -- [#2083](https://github.com/poanetwork/blockscout/pull/2083) - allow total_difficuly to be nil -- [#2086](https://github.com/poanetwork/blockscout/pull/2086) - fix geth's staticcall without output -### Chore +- [#2228](https://github.com/poanetwork/blockscout/pull/2228) - favorites duplication issues, active radio issue +- [#2207](https://github.com/poanetwork/blockscout/pull/2207) - new 'download csv' button design +- [#2206](https://github.com/poanetwork/blockscout/pull/2206) - added styles for 'Download All Transactions as CSV' button +- [#2099](https://github.com/poanetwork/blockscout/pull/2099) - logs search input width +- [#2098](https://github.com/poanetwork/blockscout/pull/2098) - nav dropdown issue, logo size issue +- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added +- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues +- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs. +- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input +- [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added +- [#2043](https://github.com/poanetwork/blockscout/pull/2043) - Fixed modal dialog width for 'verify other explorers' +- [#2025](https://github.com/poanetwork/blockscout/pull/2025) - Added a new color to display transactions' errors. +- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue +- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes. +- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide. +- [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown. +- [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment +- [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu +- [#1868](https://github.com/poanetwork/blockscout/pull/1868) - fix: logs list endpoint performance +- [#1822](https://github.com/poanetwork/blockscout/pull/1822) - Fix style breaks in decompiled contract code view +- [#1885](https://github.com/poanetwork/blockscout/pull/1885) - highlight reserved words in decompiled code +- [#1896](https://github.com/poanetwork/blockscout/pull/1896) - re-query tokens in top nav automplete +- [#1905](https://github.com/poanetwork/blockscout/pull/1905) - fix reorgs, uncles pagination +- [#1904](https://github.com/poanetwork/blockscout/pull/1904) - fix `BLOCK_COUNT_CACHE_TTL` env var type +- [#1915](https://github.com/poanetwork/blockscout/pull/1915) - fallback to 2 latest evm versions +- [#1937](https://github.com/poanetwork/blockscout/pull/1937) - Check the presence of overlap[i] object before retrieving properties from it +- [#1960](https://github.com/poanetwork/blockscout/pull/1960) - do not remove bold text in decompiled contacts +- [#1966](https://github.com/poanetwork/blockscout/pull/1966) - fix: add fields for contract filter performance +- [#2017](https://github.com/poanetwork/blockscout/pull/2017) - fix: fix to/from filters on tx list pages +- [#2008](https://github.com/poanetwork/blockscout/pull/2008) - add new function clause for xDai network beneficiaries +- [#2009](https://github.com/poanetwork/blockscout/pull/2009) - addresses page improvements +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions +- [#2062](https://github.com/poanetwork/blockscout/pull/2062) - fix: uniq by hash, instead of transaction +- [#2052](https://github.com/poanetwork/blockscout/pull/2052) - allow bytes32 for name and symbol +- [#2047](https://github.com/poanetwork/blockscout/pull/2047) - fix: show creating internal transactions +- [#2014](https://github.com/poanetwork/blockscout/pull/2014) - fix: use better queries for listLogs endpoint +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions +- [#2070](https://github.com/poanetwork/blockscout/pull/2070) - reduce `max_concurrency` of `BlocksTransactionsMismatch` fetcher +- [#2083](https://github.com/poanetwork/blockscout/pull/2083) - allow total_difficuly to be nil +- [#2086](https://github.com/poanetwork/blockscout/pull/2086) - fix geth's staticcall without output -- [#1900](https://github.com/poanetwork/blockscout/pull/1900) - SUPPORTED_CHAINS ENV var -- [#1958](https://github.com/poanetwork/blockscout/pull/1958) - Default value for release link env var -- [#1964](https://github.com/poanetwork/blockscout/pull/1964) - ALLOWED_EVM_VERSIONS env var -- [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view -- [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI -- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name -- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config -- [#2055](https://github.com/poanetwork/blockscout/pull/2055) - Increase timeout for geth indexers -- [#2069](https://github.com/poanetwork/blockscout/pull/2069) - Docsify integration: static docs page generation +### Chore +- [#1900](https://github.com/poanetwork/blockscout/pull/1900) - SUPPORTED_CHAINS ENV var +- [#1958](https://github.com/poanetwork/blockscout/pull/1958) - Default value for release link env var +- [#1964](https://github.com/poanetwork/blockscout/pull/1964) - ALLOWED_EVM_VERSIONS env var +- [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view +- [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI +- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name +- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config +- [#2055](https://github.com/poanetwork/blockscout/pull/2055) - Increase timeout for geth indexers +- [#2069](https://github.com/poanetwork/blockscout/pull/2069) - Docsify integration: static docs page generation ## 1.3.15-beta ### Features -- [#1857](https://github.com/poanetwork/blockscout/pull/1857) - Re-implement Geth JS internal transaction tracer in Elixir -- [#1989](https://github.com/poanetwork/blockscout/pull/1989) - fix: consolidate address w/ balance one at a time -- [#2002](https://github.com/poanetwork/blockscout/pull/2002) - Get estimated count of blocks when cache is empty +- [#1857](https://github.com/poanetwork/blockscout/pull/1857) - Re-implement Geth JS internal transaction tracer in Elixir +- [#1989](https://github.com/poanetwork/blockscout/pull/1989) - fix: consolidate address w/ balance one at a time +- [#2002](https://github.com/poanetwork/blockscout/pull/2002) - Get estimated count of blocks when cache is empty ### Fixes -- [#1869](https://github.com/poanetwork/blockscout/pull/1869) - Fix output and gas extraction in JS tracer for Geth -- [#1992](https://github.com/poanetwork/blockscout/pull/1992) - fix: support https for wobserver polling -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions - +- [#1869](https://github.com/poanetwork/blockscout/pull/1869) - Fix output and gas extraction in JS tracer for Geth +- [#1992](https://github.com/poanetwork/blockscout/pull/1992) - fix: support https for wobserver polling +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions ## 1.3.14-beta -- [#1812](https://github.com/poanetwork/blockscout/pull/1812) - add pagination to addresses page -- [#1920](https://github.com/poanetwork/blockscout/pull/1920) - fix: remove source code fields from list endpoint -- [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks +- [#1812](https://github.com/poanetwork/blockscout/pull/1812) - add pagination to addresses page +- [#1920](https://github.com/poanetwork/blockscout/pull/1920) - fix: remove source code fields from list endpoint +- [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks ### Fixes -- [#1917](https://github.com/poanetwork/blockscout/pull/1917) - Force block refetch if transaction is re-collated in a different block +- [#1917](https://github.com/poanetwork/blockscout/pull/1917) - Force block refetch if transaction is re-collated in a different block ### Chore -- [#1892](https://github.com/poanetwork/blockscout/pull/1892) - Remove temporary worker modules - +- [#1892](https://github.com/poanetwork/blockscout/pull/1892) - Remove temporary worker modules ## 1.3.13-beta ### Features -- [#1933](https://github.com/poanetwork/blockscout/pull/1933) - add eth_BlockNumber json rpc method +- [#1933](https://github.com/poanetwork/blockscout/pull/1933) - add eth_BlockNumber json rpc method ### Fixes -- [#1875](https://github.com/poanetwork/blockscout/pull/1875) - fix: resolve false positive constructor arguments -- [#1881](https://github.com/poanetwork/blockscout/pull/1881) - fix: store solc versions locally for performance -- [#1898](https://github.com/poanetwork/blockscout/pull/1898) - check if the constructor has arguments before verifying constructor arguments - +- [#1875](https://github.com/poanetwork/blockscout/pull/1875) - fix: resolve false positive constructor arguments +- [#1881](https://github.com/poanetwork/blockscout/pull/1881) - fix: store solc versions locally for performance +- [#1898](https://github.com/poanetwork/blockscout/pull/1898) - check if the constructor has arguments before verifying constructor arguments ## 1.3.12-beta Reverting of synchronous block counter, implemented in #1848 - ## 1.3.11-beta ### Features -- [#1815](https://github.com/poanetwork/blockscout/pull/1815) - Be able to search without prefix "0x" -- [#1813](https://github.com/poanetwork/blockscout/pull/1813) - Add total blocks counter to the main page -- [#1806](https://github.com/poanetwork/blockscout/pull/1806) - Verify contracts with a post request -- [#1848](https://github.com/poanetwork/blockscout/pull/1848) - Add cache for block counter +- [#1815](https://github.com/poanetwork/blockscout/pull/1815) - Be able to search without prefix "0x" +- [#1813](https://github.com/poanetwork/blockscout/pull/1813) - Add total blocks counter to the main page +- [#1806](https://github.com/poanetwork/blockscout/pull/1806) - Verify contracts with a post request +- [#1848](https://github.com/poanetwork/blockscout/pull/1848) - Add cache for block counter ### Fixes -- [#1829](https://github.com/poanetwork/blockscout/pull/1829) - Handle nil quantities in block decoding routine -- [#1830](https://github.com/poanetwork/blockscout/pull/1830) - Make block size field nullable -- [#1840](https://github.com/poanetwork/blockscout/pull/1840) - Handle case when total supply is nil -- [#1838](https://github.com/poanetwork/blockscout/pull/1838) - Block counter calculates only consensus blocks +- [#1829](https://github.com/poanetwork/blockscout/pull/1829) - Handle nil quantities in block decoding routine +- [#1830](https://github.com/poanetwork/blockscout/pull/1830) - Make block size field nullable +- [#1840](https://github.com/poanetwork/blockscout/pull/1840) - Handle case when total supply is nil +- [#1838](https://github.com/poanetwork/blockscout/pull/1838) - Block counter calculates only consensus blocks ### Chore -- [#1814](https://github.com/poanetwork/blockscout/pull/1814) - Clear build artefacts script -- [#1837](https://github.com/poanetwork/blockscout/pull/1837) - Add -f flag to clear_build.sh script delete static folder - +- [#1814](https://github.com/poanetwork/blockscout/pull/1814) - Clear build artefacts script +- [#1837](https://github.com/poanetwork/blockscout/pull/1837) - Add -f flag to clear_build.sh script delete static folder ## 1.3.10-beta ### Features -- [#1739](https://github.com/poanetwork/blockscout/pull/1739) - highlight decompiled source code -- [#1696](https://github.com/poanetwork/blockscout/pull/1696) - full-text search by tokens -- [#1742](https://github.com/poanetwork/blockscout/pull/1742) - Support RSK -- [#1777](https://github.com/poanetwork/blockscout/pull/1777) - show ERC-20 token transfer info on transaction page -- [#1770](https://github.com/poanetwork/blockscout/pull/1770) - set a websocket keepalive from config -- [#1789](https://github.com/poanetwork/blockscout/pull/1789) - add ERC-721 info to transaction overview page -- [#1801](https://github.com/poanetwork/blockscout/pull/1801) - Staking pools fetching +- [#1739](https://github.com/poanetwork/blockscout/pull/1739) - highlight decompiled source code +- [#1696](https://github.com/poanetwork/blockscout/pull/1696) - full-text search by tokens +- [#1742](https://github.com/poanetwork/blockscout/pull/1742) - Support RSK +- [#1777](https://github.com/poanetwork/blockscout/pull/1777) - show ERC-20 token transfer info on transaction page +- [#1770](https://github.com/poanetwork/blockscout/pull/1770) - set a websocket keepalive from config +- [#1789](https://github.com/poanetwork/blockscout/pull/1789) - add ERC-721 info to transaction overview page +- [#1801](https://github.com/poanetwork/blockscout/pull/1801) - Staking pools fetching ### Fixes - - [#1724](https://github.com/poanetwork/blockscout/pull/1724) - Remove internal tx and token balance fetching from realtime fetcher - - [#1727](https://github.com/poanetwork/blockscout/pull/1727) - add logs pagination in rpc api - - [#1740](https://github.com/poanetwork/blockscout/pull/1740) - fix empty block time - - [#1743](https://github.com/poanetwork/blockscout/pull/1743) - sort decompiled smart contracts in lexicographical order - - [#1756](https://github.com/poanetwork/blockscout/pull/1756) - add today's token balance from the previous value - - [#1769](https://github.com/poanetwork/blockscout/pull/1769) - add timestamp to block overview - - [#1768](https://github.com/poanetwork/blockscout/pull/1768) - fix first block parameter - - [#1778](https://github.com/poanetwork/blockscout/pull/1778) - Make websocket optional for realtime fetcher - - [#1790](https://github.com/poanetwork/blockscout/pull/1790) - fix constructor arguments verification - - [#1793](https://github.com/poanetwork/blockscout/pull/1793) - fix top nav autocomplete - - [#1795](https://github.com/poanetwork/blockscout/pull/1795) - fix line numbers for decompiled contracts - - [#1803](https://github.com/poanetwork/blockscout/pull/1803) - use coinmarketcap for total_supply by default - - [#1802](https://github.com/poanetwork/blockscout/pull/1802) - make coinmarketcap's number of pages configurable - - [#1799](https://github.com/poanetwork/blockscout/pull/1799) - Use eth_getUncleByBlockHashAndIndex for uncle block fetching - - [#1531](https://github.com/poanetwork/blockscout/pull/1531) - docker: fix dockerFile for secp256k1 building - - [#1835](https://github.com/poanetwork/blockscout/pull/1835) - fix: ignore `pong` messages without error +- [#1724](https://github.com/poanetwork/blockscout/pull/1724) - Remove internal tx and token balance fetching from realtime fetcher +- [#1727](https://github.com/poanetwork/blockscout/pull/1727) - add logs pagination in rpc api +- [#1740](https://github.com/poanetwork/blockscout/pull/1740) - fix empty block time +- [#1743](https://github.com/poanetwork/blockscout/pull/1743) - sort decompiled smart contracts in lexicographical order +- [#1756](https://github.com/poanetwork/blockscout/pull/1756) - add today's token balance from the previous value +- [#1769](https://github.com/poanetwork/blockscout/pull/1769) - add timestamp to block overview +- [#1768](https://github.com/poanetwork/blockscout/pull/1768) - fix first block parameter +- [#1778](https://github.com/poanetwork/blockscout/pull/1778) - Make websocket optional for realtime fetcher +- [#1790](https://github.com/poanetwork/blockscout/pull/1790) - fix constructor arguments verification +- [#1793](https://github.com/poanetwork/blockscout/pull/1793) - fix top nav autocomplete +- [#1795](https://github.com/poanetwork/blockscout/pull/1795) - fix line numbers for decompiled contracts +- [#1803](https://github.com/poanetwork/blockscout/pull/1803) - use coinmarketcap for total_supply by default +- [#1802](https://github.com/poanetwork/blockscout/pull/1802) - make coinmarketcap's number of pages configurable +- [#1799](https://github.com/poanetwork/blockscout/pull/1799) - Use eth_getUncleByBlockHashAndIndex for uncle block fetching +- [#1531](https://github.com/poanetwork/blockscout/pull/1531) - docker: fix dockerFile for secp256k1 building +- [#1835](https://github.com/poanetwork/blockscout/pull/1835) - fix: ignore `pong` messages without error ### Chore - - [#1804](https://github.com/poanetwork/blockscout/pull/1804) - (Chore) Divide chains by Mainnet/Testnet in menu - - [#1783](https://github.com/poanetwork/blockscout/pull/1783) - Update README with the chains that use Blockscout - - [#1780](https://github.com/poanetwork/blockscout/pull/1780) - Update link to the Github repo in the footer - - [#1757](https://github.com/poanetwork/blockscout/pull/1757) - Change twitter acc link to official Blockscout acc twitter - - [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link - - [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree - - [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab - - [#1744](https://github.com/poanetwork/blockscout/pull/1744) - remove `0x0..0` from tests - - [#1763](https://github.com/poanetwork/blockscout/pull/1763) - Describe indexer structure and list existing fetchers - - [#1800](https://github.com/poanetwork/blockscout/pull/1800) - Disable lazy logging check in Credo - +- [#1804](https://github.com/poanetwork/blockscout/pull/1804) - (Chore) Divide chains by Mainnet/Testnet in menu +- [#1783](https://github.com/poanetwork/blockscout/pull/1783) - Update README with the chains that use Blockscout +- [#1780](https://github.com/poanetwork/blockscout/pull/1780) - Update link to the Github repo in the footer +- [#1757](https://github.com/poanetwork/blockscout/pull/1757) - Change twitter acc link to official Blockscout acc twitter +- [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link +- [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree +- [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab +- [#1744](https://github.com/poanetwork/blockscout/pull/1744) - remove `0x0..0` from tests +- [#1763](https://github.com/poanetwork/blockscout/pull/1763) - Describe indexer structure and list existing fetchers +- [#1800](https://github.com/poanetwork/blockscout/pull/1800) - Disable lazy logging check in Credo ## 1.3.9-beta ### Features - - [#1662](https://github.com/poanetwork/blockscout/pull/1662) - allow specifying number of optimization runs - - [#1654](https://github.com/poanetwork/blockscout/pull/1654) - add decompiled code tab - - [#1661](https://github.com/poanetwork/blockscout/pull/1661) - try to compile smart contract with the latest evm version - - [#1665](https://github.com/poanetwork/blockscout/pull/1665) - Add contract verification RPC endpoint. - - [#1706](https://github.com/poanetwork/blockscout/pull/1706) - allow setting update interval for addresses with b +- [#1662](https://github.com/poanetwork/blockscout/pull/1662) - allow specifying number of optimization runs +- [#1654](https://github.com/poanetwork/blockscout/pull/1654) - add decompiled code tab +- [#1661](https://github.com/poanetwork/blockscout/pull/1661) - try to compile smart contract with the latest evm version +- [#1665](https://github.com/poanetwork/blockscout/pull/1665) - Add contract verification RPC endpoint. +- [#1706](https://github.com/poanetwork/blockscout/pull/1706) - allow setting update interval for addresses with b ### Fixes - - [#1669](https://github.com/poanetwork/blockscout/pull/1669) - do not fail if multiple matching tokens are found - - [#1691](https://github.com/poanetwork/blockscout/pull/1691) - decrease token metadata update interval - - [#1688](https://github.com/poanetwork/blockscout/pull/1688) - do not fail if failure reason is atom - - [#1692](https://github.com/poanetwork/blockscout/pull/1692) - exclude decompiled smart contract from encoding - - [#1684](https://github.com/poanetwork/blockscout/pull/1684) - Discard child block with parent_hash not matching hash of imported block - - [#1699](https://github.com/poanetwork/blockscout/pull/1699) - use seconds as transaction cache period measure - - [#1697](https://github.com/poanetwork/blockscout/pull/1697) - fix failing in rpc if balance is empty - - [#1711](https://github.com/poanetwork/blockscout/pull/1711) - rescue failing repo in block number cache update - - [#1712](https://github.com/poanetwork/blockscout/pull/1712) - do not set contract code from transaction input - - [#1714](https://github.com/poanetwork/blockscout/pull/1714) - fix average block time calculation +- [#1669](https://github.com/poanetwork/blockscout/pull/1669) - do not fail if multiple matching tokens are found +- [#1691](https://github.com/poanetwork/blockscout/pull/1691) - decrease token metadata update interval +- [#1688](https://github.com/poanetwork/blockscout/pull/1688) - do not fail if failure reason is atom +- [#1692](https://github.com/poanetwork/blockscout/pull/1692) - exclude decompiled smart contract from encoding +- [#1684](https://github.com/poanetwork/blockscout/pull/1684) - Discard child block with parent_hash not matching hash of imported block +- [#1699](https://github.com/poanetwork/blockscout/pull/1699) - use seconds as transaction cache period measure +- [#1697](https://github.com/poanetwork/blockscout/pull/1697) - fix failing in rpc if balance is empty +- [#1711](https://github.com/poanetwork/blockscout/pull/1711) - rescue failing repo in block number cache update +- [#1712](https://github.com/poanetwork/blockscout/pull/1712) - do not set contract code from transaction input +- [#1714](https://github.com/poanetwork/blockscout/pull/1714) - fix average block time calculation ### Chore - - [#1693](https://github.com/poanetwork/blockscout/pull/1693) - Add a checklist to the PR template - +- [#1693](https://github.com/poanetwork/blockscout/pull/1693) - Add a checklist to the PR template ## 1.3.8-beta ### Features - - [#1611](https://github.com/poanetwork/blockscout/pull/1611) - allow setting the first indexing block - - [#1596](https://github.com/poanetwork/blockscout/pull/1596) - add endpoint to create decompiled contracts - - [#1634](https://github.com/poanetwork/blockscout/pull/1634) - add transaction count cache +- [#1611](https://github.com/poanetwork/blockscout/pull/1611) - allow setting the first indexing block +- [#1596](https://github.com/poanetwork/blockscout/pull/1596) - add endpoint to create decompiled contracts +- [#1634](https://github.com/poanetwork/blockscout/pull/1634) - add transaction count cache ### Fixes - - [#1630](https://github.com/poanetwork/blockscout/pull/1630) - (Fix) colour for release link in the footer - - [#1621](https://github.com/poanetwork/blockscout/pull/1621) - Modify query to fetch failed contract creations - - [#1614](https://github.com/poanetwork/blockscout/pull/1614) - Do not fetch burn address token balance - - [#1639](https://github.com/poanetwork/blockscout/pull/1614) - Optimize token holder count updates when importing address current balances - - [#1643](https://github.com/poanetwork/blockscout/pull/1643) - Set internal_transactions_indexed_at for empty blocks - - [#1647](https://github.com/poanetwork/blockscout/pull/1647) - Fix typo in view - - [#1650](https://github.com/poanetwork/blockscout/pull/1650) - Add petersburg evm version to smart contract verifier - - [#1657](https://github.com/poanetwork/blockscout/pull/1657) - Force consensus loss for parent block if its hash mismatches parent_hash +- [#1630](https://github.com/poanetwork/blockscout/pull/1630) - (Fix) colour for release link in the footer +- [#1621](https://github.com/poanetwork/blockscout/pull/1621) - Modify query to fetch failed contract creations +- [#1614](https://github.com/poanetwork/blockscout/pull/1614) - Do not fetch burn address token balance +- [#1639](https://github.com/poanetwork/blockscout/pull/1614) - Optimize token holder count updates when importing address current balances +- [#1643](https://github.com/poanetwork/blockscout/pull/1643) - Set internal_transactions_indexed_at for empty blocks +- [#1647](https://github.com/poanetwork/blockscout/pull/1647) - Fix typo in view +- [#1650](https://github.com/poanetwork/blockscout/pull/1650) - Add petersburg evm version to smart contract verifier +- [#1657](https://github.com/poanetwork/blockscout/pull/1657) - Force consensus loss for parent block if its hash mismatches parent_hash ### Chore - ## 1.3.7-beta ### Features ### Fixes - - [#1615](https://github.com/poanetwork/blockscout/pull/1615) - Add more logging to code fixer process - - [#1613](https://github.com/poanetwork/blockscout/pull/1613) - Fix USD fee value - - [#1577](https://github.com/poanetwork/blockscout/pull/1577) - Add process to fix contract with code - - [#1583](https://github.com/poanetwork/blockscout/pull/1583) - Chunk JSON-RPC batches in case connection times out +- [#1615](https://github.com/poanetwork/blockscout/pull/1615) - Add more logging to code fixer process +- [#1613](https://github.com/poanetwork/blockscout/pull/1613) - Fix USD fee value +- [#1577](https://github.com/poanetwork/blockscout/pull/1577) - Add process to fix contract with code +- [#1583](https://github.com/poanetwork/blockscout/pull/1583) - Chunk JSON-RPC batches in case connection times out ### Chore - - [#1610](https://github.com/poanetwork/blockscout/pull/1610) - Add PIRL to Readme - +- [#1610](https://github.com/poanetwork/blockscout/pull/1610) - Add PIRL to Readme ## 1.3.6-beta ### Features - - [#1589](https://github.com/poanetwork/blockscout/pull/1589) - RPC endpoint to list addresses - - [#1567](https://github.com/poanetwork/blockscout/pull/1567) - Allow setting different configuration just for realtime fetcher - - [#1562](https://github.com/poanetwork/blockscout/pull/1562) - Add incoming transactions count to contract view - - [#1608](https://github.com/poanetwork/blockscout/pull/1608) - Add listcontracts RPC Endpoint +- [#1589](https://github.com/poanetwork/blockscout/pull/1589) - RPC endpoint to list addresses +- [#1567](https://github.com/poanetwork/blockscout/pull/1567) - Allow setting different configuration just for realtime fetcher +- [#1562](https://github.com/poanetwork/blockscout/pull/1562) - Add incoming transactions count to contract view +- [#1608](https://github.com/poanetwork/blockscout/pull/1608) - Add listcontracts RPC Endpoint ### Fixes - - [#1595](https://github.com/poanetwork/blockscout/pull/1595) - Reduce block_rewards in the catchup fetcher - - [#1590](https://github.com/poanetwork/blockscout/pull/1590) - Added guard for fetching blocks with invalid number - - [#1588](https://github.com/poanetwork/blockscout/pull/1588) - Fix usd value on address page - - [#1586](https://github.com/poanetwork/blockscout/pull/1586) - Exact timestamp display - - [#1581](https://github.com/poanetwork/blockscout/pull/1581) - Consider `creates` param when fetching transactions - - [#1559](https://github.com/poanetwork/blockscout/pull/1559) - Change v column type for Transactions table +- [#1595](https://github.com/poanetwork/blockscout/pull/1595) - Reduce block_rewards in the catchup fetcher +- [#1590](https://github.com/poanetwork/blockscout/pull/1590) - Added guard for fetching blocks with invalid number +- [#1588](https://github.com/poanetwork/blockscout/pull/1588) - Fix usd value on address page +- [#1586](https://github.com/poanetwork/blockscout/pull/1586) - Exact timestamp display +- [#1581](https://github.com/poanetwork/blockscout/pull/1581) - Consider `creates` param when fetching transactions +- [#1559](https://github.com/poanetwork/blockscout/pull/1559) - Change v column type for Transactions table ### Chore - - [#1579](https://github.com/poanetwork/blockscout/pull/1579) - Add SpringChain to the list of Additional Chains Utilizing BlockScout - - [#1578](https://github.com/poanetwork/blockscout/pull/1578) - Refine contributing procedure - - [#1572](https://github.com/poanetwork/blockscout/pull/1572) - Add option to disable block rewards in indexer config - +- [#1579](https://github.com/poanetwork/blockscout/pull/1579) - Add SpringChain to the list of Additional Chains Utilizing BlockScout +- [#1578](https://github.com/poanetwork/blockscout/pull/1578) - Refine contributing procedure +- [#1572](https://github.com/poanetwork/blockscout/pull/1572) - Add option to disable block rewards in indexer config ## 1.3.5-beta ### Features - - [#1560](https://github.com/poanetwork/blockscout/pull/1560) - Allow executing smart contract functions in arbitrarily sized batches - - [#1543](https://github.com/poanetwork/blockscout/pull/1543) - Use trace_replayBlockTransactions API for faster tracing - - [#1558](https://github.com/poanetwork/blockscout/pull/1558) - Allow searching by token symbol - - [#1551](https://github.com/poanetwork/blockscout/pull/1551) Exact date and time for Transaction details page - - [#1547](https://github.com/poanetwork/blockscout/pull/1547) - Verify smart contracts with evm versions - - [#1540](https://github.com/poanetwork/blockscout/pull/1540) - Fetch ERC721 token balances if sender is '0x0..0' - - [#1539](https://github.com/poanetwork/blockscout/pull/1539) - Add the link to release in the footer - - [#1519](https://github.com/poanetwork/blockscout/pull/1519) - Create contract methods - - [#1496](https://github.com/poanetwork/blockscout/pull/1496) - Remove dropped/replaced transactions in pending transactions list - - [#1492](https://github.com/poanetwork/blockscout/pull/1492) - Disable usd value for an empty exchange rate - - [#1466](https://github.com/poanetwork/blockscout/pull/1466) - Decoding candidates for unverified contracts +- [#1560](https://github.com/poanetwork/blockscout/pull/1560) - Allow executing smart contract functions in arbitrarily sized batches +- [#1543](https://github.com/poanetwork/blockscout/pull/1543) - Use trace_replayBlockTransactions API for faster tracing +- [#1558](https://github.com/poanetwork/blockscout/pull/1558) - Allow searching by token symbol +- [#1551](https://github.com/poanetwork/blockscout/pull/1551) Exact date and time for Transaction details page +- [#1547](https://github.com/poanetwork/blockscout/pull/1547) - Verify smart contracts with evm versions +- [#1540](https://github.com/poanetwork/blockscout/pull/1540) - Fetch ERC721 token balances if sender is '0x0..0' +- [#1539](https://github.com/poanetwork/blockscout/pull/1539) - Add the link to release in the footer +- [#1519](https://github.com/poanetwork/blockscout/pull/1519) - Create contract methods +- [#1496](https://github.com/poanetwork/blockscout/pull/1496) - Remove dropped/replaced transactions in pending transactions list +- [#1492](https://github.com/poanetwork/blockscout/pull/1492) - Disable usd value for an empty exchange rate +- [#1466](https://github.com/poanetwork/blockscout/pull/1466) - Decoding candidates for unverified contracts ### Fixes - - [#1545](https://github.com/poanetwork/blockscout/pull/1545) - Fix scheduling of latest block polling in Realtime Fetcher - - [#1554](https://github.com/poanetwork/blockscout/pull/1554) - Encode integer parameters when calling smart contract functions - - [#1537](https://github.com/poanetwork/blockscout/pull/1537) - Fix test that depended on date - - [#1534](https://github.com/poanetwork/blockscout/pull/1534) - Render a nicer error when creator cannot be determined - - [#1527](https://github.com/poanetwork/blockscout/pull/1527) - Add index to value_fetched_at - - [#1518](https://github.com/poanetwork/blockscout/pull/1518) - Select only distinct failed transactions - - [#1516](https://github.com/poanetwork/blockscout/pull/1516) - Fix coin balance params reducer for pending transaction - - [#1511](https://github.com/poanetwork/blockscout/pull/1511) - Set correct log level for production - - [#1510](https://github.com/poanetwork/blockscout/pull/1510) - Fix test that fails every 1st day of the month - - [#1509](https://github.com/poanetwork/blockscout/pull/1509) - Add index to blocks' consensus - - [#1508](https://github.com/poanetwork/blockscout/pull/1508) - Remove duplicated indexes - - [#1505](https://github.com/poanetwork/blockscout/pull/1505) - Use https instead of ssh for absinthe libs - - [#1501](https://github.com/poanetwork/blockscout/pull/1501) - Constructor_arguments must be type `text` - - [#1498](https://github.com/poanetwork/blockscout/pull/1498) - Add index for created_contract_address_hash in transactions - - [#1493](https://github.com/poanetwork/blockscout/pull/1493) - Do not do work in process initialization - - [#1487](https://github.com/poanetwork/blockscout/pull/1487) - Limit geth sync to 128 blocks - - [#1484](https://github.com/poanetwork/blockscout/pull/1484) - Allow decoding input as utf-8 - - [#1479](https://github.com/poanetwork/blockscout/pull/1479) - Remove smoothing from coin balance chart + +- [#1545](https://github.com/poanetwork/blockscout/pull/1545) - Fix scheduling of latest block polling in Realtime Fetcher +- [#1554](https://github.com/poanetwork/blockscout/pull/1554) - Encode integer parameters when calling smart contract functions +- [#1537](https://github.com/poanetwork/blockscout/pull/1537) - Fix test that depended on date +- [#1534](https://github.com/poanetwork/blockscout/pull/1534) - Render a nicer error when creator cannot be determined +- [#1527](https://github.com/poanetwork/blockscout/pull/1527) - Add index to value_fetched_at +- [#1518](https://github.com/poanetwork/blockscout/pull/1518) - Select only distinct failed transactions +- [#1516](https://github.com/poanetwork/blockscout/pull/1516) - Fix coin balance params reducer for pending transaction +- [#1511](https://github.com/poanetwork/blockscout/pull/1511) - Set correct log level for production +- [#1510](https://github.com/poanetwork/blockscout/pull/1510) - Fix test that fails every 1st day of the month +- [#1509](https://github.com/poanetwork/blockscout/pull/1509) - Add index to blocks' consensus +- [#1508](https://github.com/poanetwork/blockscout/pull/1508) - Remove duplicated indexes +- [#1505](https://github.com/poanetwork/blockscout/pull/1505) - Use https instead of ssh for absinthe libs +- [#1501](https://github.com/poanetwork/blockscout/pull/1501) - Constructor_arguments must be type `text` +- [#1498](https://github.com/poanetwork/blockscout/pull/1498) - Add index for created_contract_address_hash in transactions +- [#1493](https://github.com/poanetwork/blockscout/pull/1493) - Do not do work in process initialization +- [#1487](https://github.com/poanetwork/blockscout/pull/1487) - Limit geth sync to 128 blocks +- [#1484](https://github.com/poanetwork/blockscout/pull/1484) - Allow decoding input as utf-8 +- [#1479](https://github.com/poanetwork/blockscout/pull/1479) - Remove smoothing from coin balance chart ### Chore - - [https://github.com/poanetwork/blockscout/pull/1532](https://github.com/poanetwork/blockscout/pull/1532) - Upgrade elixir to 1.8.1 - - [https://github.com/poanetwork/blockscout/pull/1553](https://github.com/poanetwork/blockscout/pull/1553) - Dockerfile: remove 1.7.1 version pin FROM bitwalker/alpine-elixir-phoenix - - [https://github.com/poanetwork/blockscout/pull/1465](https://github.com/poanetwork/blockscout/pull/1465) - Resolve lodash security alert + +- - Upgrade elixir to 1.8.1 +- - Dockerfile: remove 1.7.1 version pin FROM bitwalker/alpine-elixir-phoenix +- - Resolve lodash security alert From 87ed8d6aa56736543adeef65e812ac2ae4d3c1ce Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Thu, 29 Aug 2019 13:05:00 +0200 Subject: [PATCH 282/290] Fixed incorrect numerical order in Chores --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 971696703b..b2c1662db9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,8 +29,8 @@ - [#2646](https://github.com/poanetwork/blockscout/pull/2646) - Added Xerom to list of Additional Chains using BlockScout - [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown -- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities - [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted +- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities - [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically - [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases - [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table From 5ed0fe694cd93cebdd32f422442dbbcadc4ed359 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Thu, 29 Aug 2019 13:14:23 +0200 Subject: [PATCH 283/290] Changelog.md Clean up --- CHANGELOG.md | 855 +++++++++++++++++++++++++-------------------------- 1 file changed, 427 insertions(+), 428 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2c1662db9..812cf4d350 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,574 +1,573 @@ ## Current ### Features - -- [#2555](https://github.com/poanetwork/blockscout/pull/2555) - find and show decoding candidates for logs -- [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type -- [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method -- [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges -- [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation +- [#2555](https://github.com/poanetwork/blockscout/pull/2555) - find and show decoding candidates for logs +- [#2596](https://github.com/poanetwork/blockscout/pull/2596) - support AuRa's empty step reward type +- [#2561](https://github.com/poanetwork/blockscout/pull/2561) - Add token's type to the response of tokenlist method +- [#2499](https://github.com/poanetwork/blockscout/pull/2499) - import emission reward ranges +- [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes - -- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons -- [#2635](https://github.com/poanetwork/blockscout/pull/2635) - optimize ERC721 inventory query -- [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues -- [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test -- [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta -- [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint -- [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper -- [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css -- [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload -- [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter -- [#2568](https://github.com/poanetwork/blockscout/pull/2568) - filter pending token transfers -- [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs -- [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button -- [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records +- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons +- [#2635](https://github.com/poanetwork/blockscout/pull/2635) - optimize ERC721 inventory query +- [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues +- [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test +- [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta +- [#2613](https://github.com/poanetwork/blockscout/pull/2613) - fix getminedblocks rpc endpoint +- [#2592](https://github.com/poanetwork/blockscout/pull/2592) - process new metadata format for whisper +- [#2572](https://github.com/poanetwork/blockscout/pull/2572) - Ease non-critical css +- [#2570](https://github.com/poanetwork/blockscout/pull/2570) - Network icons preload +- [#2569](https://github.com/poanetwork/blockscout/pull/2569) - do not fetch emission rewards for transactions csv exporter +- [#2568](https://github.com/poanetwork/blockscout/pull/2568) - filter pending token transfers +- [#2564](https://github.com/poanetwork/blockscout/pull/2564) - fix first page button for uncles and reorgs +- [#2563](https://github.com/poanetwork/blockscout/pull/2563) - Fix view less transfers button +- [#2538](https://github.com/poanetwork/blockscout/pull/2538) - fetch the last not empty coin balance records ### Chore +- [#2646](https://github.com/poanetwork/blockscout/pull/2646) - Added Xerom to list of Additional Chains using BlockScout +- [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown +- [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted +- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities +- [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically +- [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases +- [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table +- [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error +- [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix -- [#2646](https://github.com/poanetwork/blockscout/pull/2646) - Added Xerom to list of Additional Chains using BlockScout -- [#2634](https://github.com/poanetwork/blockscout/pull/2634) - add Lukso to networks dropdown -- [#2617](https://github.com/poanetwork/blockscout/pull/2617) - skip cache update if there are no blocks inserted -- [#2611](https://github.com/poanetwork/blockscout/pull/2611) - fix js dependency vulnerabilities -- [#2594](https://github.com/poanetwork/blockscout/pull/2594) - do not start genesis data fetching periodically -- [#2590](https://github.com/poanetwork/blockscout/pull/2590) - restore backward compatablity with old releases -- [#2577](https://github.com/poanetwork/blockscout/pull/2577) - Need recompile column in the env vars table -- [#2574](https://github.com/poanetwork/blockscout/pull/2574) - limit request body in json rpc error -- [#2566](https://github.com/poanetwork/blockscout/pull/2566) - upgrade absinthe phoenix ## 2.0.3-beta ### Features - -- [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation -- [#2529](https://github.com/poanetwork/blockscout/pull/2529) - show both eth value and token transfers on transaction overview page -- [#2376](https://github.com/poanetwork/blockscout/pull/2376) - Split API and WebApp routes -- [#2477](https://github.com/poanetwork/blockscout/pull/2477) - aggregate token transfers on transaction page -- [#2458](https://github.com/poanetwork/blockscout/pull/2458) - Add LAST_BLOCK var to add ability indexing in the range of blocks -- [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth -- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method +- [#2433](https://github.com/poanetwork/blockscout/pull/2433) - Add a functionality to try Eth RPC methods in the documentation +- [#2529](https://github.com/poanetwork/blockscout/pull/2529) - show both eth value and token transfers on transaction overview page +- [#2376](https://github.com/poanetwork/blockscout/pull/2376) - Split API and WebApp routes +- [#2477](https://github.com/poanetwork/blockscout/pull/2477) - aggregate token transfers on transaction page +- [#2458](https://github.com/poanetwork/blockscout/pull/2458) - Add LAST_BLOCK var to add ability indexing in the range of blocks +- [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth +- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method ### Fixes - -- [#2562](https://github.com/poanetwork/blockscout/pull/2562) - Fix dark theme flickering -- [#2560](https://github.com/poanetwork/blockscout/pull/2560) - fix slash before not empty path in docs -- [#2559](https://github.com/poanetwork/blockscout/pull/2559) - fix rsk total supply for empty exchange rate -- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass -- [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend -- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip -- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox -- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page -- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search -- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles -- [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page -- [#2528](https://github.com/poanetwork/blockscout/pull/2528) - fix coin history chart data -- [#2520](https://github.com/poanetwork/blockscout/pull/2520) - Hide loading message when fetching is failed -- [#2523](https://github.com/poanetwork/blockscout/pull/2523) - Avoid importing internal_transactions of pending transactions -- [#2519](https://github.com/poanetwork/blockscout/pull/2519) - enable `First` page button in pagination -- [#2518](https://github.com/poanetwork/blockscout/pull/2518) - create suggested indexes -- [#2517](https://github.com/poanetwork/blockscout/pull/2517) - remove duplicate indexes -- [#2515](https://github.com/poanetwork/blockscout/pull/2515) - do not aggregate NFT token transfers -- [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css -- [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix -- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps fix -- [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix -- [#2506](https://github.com/poanetwork/blockscout/pull/2506) - fix two active tab in the top menu -- [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance -- [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout -- [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes -- [#2496](https://github.com/poanetwork/blockscout/pull/2496) - fix docker build -- [#2495](https://github.com/poanetwork/blockscout/pull/2495) - fix logs for indexed chain -- [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query -- [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB -- [#2551](https://github.com/poanetwork/blockscout/pull/2551) - Correctly handle dynamically created Bootstrap tooltips +- [#2562](https://github.com/poanetwork/blockscout/pull/2562) - Fix dark theme flickering +- [#2560](https://github.com/poanetwork/blockscout/pull/2560) - fix slash before not empty path in docs +- [#2559](https://github.com/poanetwork/blockscout/pull/2559) - fix rsk total supply for empty exchange rate +- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass +- [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend +- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip +- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox +- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page +- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search +- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles +- [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page +- [#2528](https://github.com/poanetwork/blockscout/pull/2528) - fix coin history chart data +- [#2520](https://github.com/poanetwork/blockscout/pull/2520) - Hide loading message when fetching is failed +- [#2523](https://github.com/poanetwork/blockscout/pull/2523) - Avoid importing internal_transactions of pending transactions +- [#2519](https://github.com/poanetwork/blockscout/pull/2519) - enable `First` page button in pagination +- [#2518](https://github.com/poanetwork/blockscout/pull/2518) - create suggested indexes +- [#2517](https://github.com/poanetwork/blockscout/pull/2517) - remove duplicate indexes +- [#2515](https://github.com/poanetwork/blockscout/pull/2515) - do not aggregate NFT token transfers +- [#2514](https://github.com/poanetwork/blockscout/pull/2514) - Isolating of staking dapp css && extracting of non-critical css +- [#2512](https://github.com/poanetwork/blockscout/pull/2512) - alert link fix +- [#2509](https://github.com/poanetwork/blockscout/pull/2509) - value-ticker gaps fix +- [#2508](https://github.com/poanetwork/blockscout/pull/2508) - logs view columns fix +- [#2506](https://github.com/poanetwork/blockscout/pull/2506) - fix two active tab in the top menu +- [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance +- [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout +- [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes +- [#2496](https://github.com/poanetwork/blockscout/pull/2496) - fix docker build +- [#2495](https://github.com/poanetwork/blockscout/pull/2495) - fix logs for indexed chain +- [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query +- [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB +- [#2551](https://github.com/poanetwork/blockscout/pull/2551) - Correctly handle dynamically created Bootstrap tooltips ### Chore +- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs +- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage +- [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload +- [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork +- [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings +- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 +- [#2492](https://github.com/poanetwork/blockscout/pull/2492) - hide decoded row if event is not decoded +- [#2490](https://github.com/poanetwork/blockscout/pull/2490) - enable credo duplicated code check +- [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version +- [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock +- [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin +- [#2450](https://github.com/poanetwork/blockscout/pull/2450) - Fix clearance of logs and node_modules folders in clearing script +- [#2434](https://github.com/poanetwork/blockscout/pull/2434) - get rid of timex warnings +- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 +- [#2373](https://github.com/poanetwork/blockscout/pull/2373) - Add script to validate internal_transactions constraint for large DBs -- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs -- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage -- [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload -- [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork -- [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings -- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 -- [#2492](https://github.com/poanetwork/blockscout/pull/2492) - hide decoded row if event is not decoded -- [#2490](https://github.com/poanetwork/blockscout/pull/2490) - enable credo duplicated code check -- [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version -- [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock -- [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin -- [#2450](https://github.com/poanetwork/blockscout/pull/2450) - Fix clearance of logs and node_modules folders in clearing script -- [#2434](https://github.com/poanetwork/blockscout/pull/2434) - get rid of timex warnings -- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0 -- [#2373](https://github.com/poanetwork/blockscout/pull/2373) - Add script to validate internal_transactions constraint for large DBs ## 2.0.2-beta ### Features - -- [#2412](https://github.com/poanetwork/blockscout/pull/2412) - dark theme -- [#2399](https://github.com/poanetwork/blockscout/pull/2399) - decode verified smart contract's logs -- [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements -- [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty -- [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts -- [#2366](https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs -- [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification -- [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions -- [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint -- [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page +- [#2412](https://github.com/poanetwork/blockscout/pull/2412) - dark theme +- [#2399](https://github.com/poanetwork/blockscout/pull/2399) - decode verified smart contract's logs +- [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements +- [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty +- [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts +- [#2366](https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs +- [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification +- [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions +- [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint +- [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page ### Fixes - -- [#2421](https://github.com/poanetwork/blockscout/pull/2421) - Fix hiding of loader for txs on the main page -- [#2420](https://github.com/poanetwork/blockscout/pull/2420) - fetch data from cache in healthy endpoint -- [#2416](https://github.com/poanetwork/blockscout/pull/2416) - Fix "page not found" handling in the router -- [#2413](https://github.com/poanetwork/blockscout/pull/2413) - remove outer tables for decoded data -- [#2410](https://github.com/poanetwork/blockscout/pull/2410) - preload smart contract for logs decoding -- [#2405](https://github.com/poanetwork/blockscout/pull/2405) - added templates for table loader and tile loader -- [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate -- [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used) -- [#2388](https://github.com/poanetwork/blockscout/pull/2388) - add create2 support to geth's js tracer -- [#2387](https://github.com/poanetwork/blockscout/pull/2387) - fix not existing keys in transaction json rpc -- [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css -- [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info -- [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict -- [#2346](https://github.com/poanetwork/blockscout/pull/2346) - Avoid fetching internal transactions of blocks that still need refetching -- [#2350](https://github.com/poanetwork/blockscout/pull/2350) - fix invalid User agent headers -- [#2345](https://github.com/poanetwork/blockscout/pull/2345) - do not override existing market records -- [#2337](https://github.com/poanetwork/blockscout/pull/2337) - set url params for prod explicitly -- [#2341](https://github.com/poanetwork/blockscout/pull/2341) - fix transaction input json encoding -- [#2311](https://github.com/poanetwork/blockscout/pull/2311) - fix market history overriding with zeroes -- [#2310](https://github.com/poanetwork/blockscout/pull/2310) - parse url for api docs -- [#2299](https://github.com/poanetwork/blockscout/pull/2299) - fix interpolation in error message -- [#2303](https://github.com/poanetwork/blockscout/pull/2303) - fix transaction csv download link -- [#2304](https://github.com/poanetwork/blockscout/pull/2304) - footer grid fix for md resolution -- [#2291](https://github.com/poanetwork/blockscout/pull/2291) - dashboard fix for md resolution, transactions load fix, block info row fix, addresses page issue, check mark issue -- [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments +- [#2421](https://github.com/poanetwork/blockscout/pull/2421) - Fix hiding of loader for txs on the main page +- [#2420](https://github.com/poanetwork/blockscout/pull/2420) - fetch data from cache in healthy endpoint +- [#2416](https://github.com/poanetwork/blockscout/pull/2416) - Fix "page not found" handling in the router +- [#2413](https://github.com/poanetwork/blockscout/pull/2413) - remove outer tables for decoded data +- [#2410](https://github.com/poanetwork/blockscout/pull/2410) - preload smart contract for logs decoding +- [#2405](https://github.com/poanetwork/blockscout/pull/2405) - added templates for table loader and tile loader +- [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate +- [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used) +- [#2388](https://github.com/poanetwork/blockscout/pull/2388) - add create2 support to geth's js tracer +- [#2387](https://github.com/poanetwork/blockscout/pull/2387) - fix not existing keys in transaction json rpc +- [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css +- [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info +- [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict +- [#2346](https://github.com/poanetwork/blockscout/pull/2346) - Avoid fetching internal transactions of blocks that still need refetching +- [#2350](https://github.com/poanetwork/blockscout/pull/2350) - fix invalid User agent headers +- [#2345](https://github.com/poanetwork/blockscout/pull/2345) - do not override existing market records +- [#2337](https://github.com/poanetwork/blockscout/pull/2337) - set url params for prod explicitly +- [#2341](https://github.com/poanetwork/blockscout/pull/2341) - fix transaction input json encoding +- [#2311](https://github.com/poanetwork/blockscout/pull/2311) - fix market history overriding with zeroes +- [#2310](https://github.com/poanetwork/blockscout/pull/2310) - parse url for api docs +- [#2299](https://github.com/poanetwork/blockscout/pull/2299) - fix interpolation in error message +- [#2303](https://github.com/poanetwork/blockscout/pull/2303) - fix transaction csv download link +- [#2304](https://github.com/poanetwork/blockscout/pull/2304) - footer grid fix for md resolution +- [#2291](https://github.com/poanetwork/blockscout/pull/2291) - dashboard fix for md resolution, transactions load fix, block info row fix, addresses page issue, check mark issue +- [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments ### Chore +- [#2422](https://github.com/poanetwork/blockscout/pull/2422) - check if address_id is binary in token_transfers_csv endpoint +- [#2418](https://github.com/poanetwork/blockscout/pull/2418) - Remove parentheses in market cap percentage +- [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache +- [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc +- [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup +- [#2325](https://github.com/poanetwork/blockscout/pull/2325) - Reduce function input to address' hash only where possible +- [#2323](https://github.com/poanetwork/blockscout/pull/2323) - Group Explorer caches +- [#2305](https://github.com/poanetwork/blockscout/pull/2305) - Improve Address controllers +- [#2302](https://github.com/poanetwork/blockscout/pull/2302) - fix names for xDai source +- [#2289](https://github.com/poanetwork/blockscout/pull/2289) - Optional websockets for dev environment +- [#2307](https://github.com/poanetwork/blockscout/pull/2307) - add GoJoy to README +- [#2293](https://github.com/poanetwork/blockscout/pull/2293) - remove request idle timeout configuration +- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - bump elixir version to 1.9.0 -- [#2422](https://github.com/poanetwork/blockscout/pull/2422) - check if address_id is binary in token_transfers_csv endpoint -- [#2418](https://github.com/poanetwork/blockscout/pull/2418) - Remove parentheses in market cap percentage -- [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache -- [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc -- [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup -- [#2325](https://github.com/poanetwork/blockscout/pull/2325) - Reduce function input to address' hash only where possible -- [#2323](https://github.com/poanetwork/blockscout/pull/2323) - Group Explorer caches -- [#2305](https://github.com/poanetwork/blockscout/pull/2305) - Improve Address controllers -- [#2302](https://github.com/poanetwork/blockscout/pull/2302) - fix names for xDai source -- [#2289](https://github.com/poanetwork/blockscout/pull/2289) - Optional websockets for dev environment -- [#2307](https://github.com/poanetwork/blockscout/pull/2307) - add GoJoy to README -- [#2293](https://github.com/poanetwork/blockscout/pull/2293) - remove request idle timeout configuration -- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - bump elixir version to 1.9.0 ## 2.0.1-beta ### Features - -- [#2283](https://github.com/poanetwork/blockscout/pull/2283) - Add transactions cache -- [#2182](https://github.com/poanetwork/blockscout/pull/2182) - add market history cache -- [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch -- [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache -- [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty -- [#2191](https://github.com/poanetwork/blockscout/pull/2191) - allow to configure token metadata update interval -- [#2146](https://github.com/poanetwork/blockscout/pull/2146) - feat: add eth_getLogs rpc endpoint -- [#2216](https://github.com/poanetwork/blockscout/pull/2216) - Improve token's controllers by avoiding unnecessary preloads -- [#2235](https://github.com/poanetwork/blockscout/pull/2235) - save and show additional validation fields to smart contract -- [#2190](https://github.com/poanetwork/blockscout/pull/2190) - show all token transfers -- [#2193](https://github.com/poanetwork/blockscout/pull/2193) - feat: add BLOCKSCOUT_HOST, and use it in API docs -- [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation +- [#2283](https://github.com/poanetwork/blockscout/pull/2283) - Add transactions cache +- [#2182](https://github.com/poanetwork/blockscout/pull/2182) - add market history cache +- [#2109](https://github.com/poanetwork/blockscout/pull/2109) - use bigger updates instead of `Multi` transactions in BlocksTransactionsMismatch +- [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache +- [#2151](https://github.com/poanetwork/blockscout/pull/2151) - hide dropdown menu then other networks list is empty +- [#2191](https://github.com/poanetwork/blockscout/pull/2191) - allow to configure token metadata update interval +- [#2146](https://github.com/poanetwork/blockscout/pull/2146) - feat: add eth_getLogs rpc endpoint +- [#2216](https://github.com/poanetwork/blockscout/pull/2216) - Improve token's controllers by avoiding unnecessary preloads +- [#2235](https://github.com/poanetwork/blockscout/pull/2235) - save and show additional validation fields to smart contract +- [#2190](https://github.com/poanetwork/blockscout/pull/2190) - show all token transfers +- [#2193](https://github.com/poanetwork/blockscout/pull/2193) - feat: add BLOCKSCOUT_HOST, and use it in API docs +- [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation ### Fixes - -- [#2290](https://github.com/poanetwork/blockscout/pull/2290) - Add eth_get_balance.json to AddressView's render -- [#2286](https://github.com/poanetwork/blockscout/pull/2286) - banner stats issues on sm resolutions, transactions title issue -- [#2284](https://github.com/poanetwork/blockscout/pull/2284) - add 404 status for not existing pages -- [#2244](https://github.com/poanetwork/blockscout/pull/2244) - fix internal transactions failing to be indexed because of constraint -- [#2281](https://github.com/poanetwork/blockscout/pull/2281) - typo issues, dropdown issues -- [#2278](https://github.com/poanetwork/blockscout/pull/2278) - increase threshold for scientific notation -- [#2275](https://github.com/poanetwork/blockscout/pull/2275) - Description for networks selector -- [#2263](https://github.com/poanetwork/blockscout/pull/2263) - added an ability to close network selector on outside click -- [#2257](https://github.com/poanetwork/blockscout/pull/2257) - 'download csv' button added to different tabs -- [#2242](https://github.com/poanetwork/blockscout/pull/2242) - added styles for 'download csv' button -- [#2261](https://github.com/poanetwork/blockscout/pull/2261) - header logo aligned to the center properly -- [#2254](https://github.com/poanetwork/blockscout/pull/2254) - search length issue, tile link wrapping issue -- [#2238](https://github.com/poanetwork/blockscout/pull/2238) - header content alignment issue, hide navbar on outside click -- [#2229](https://github.com/poanetwork/blockscout/pull/2229) - gap issue between qr and copy button in token transfers, top cards width and height issue -- [#2201](https://github.com/poanetwork/blockscout/pull/2201) - footer columns fix -- [#2179](https://github.com/poanetwork/blockscout/pull/2179) - fix docker build error -- [#2165](https://github.com/poanetwork/blockscout/pull/2165) - sort blocks by timestamp when calculating average block time -- [#2175](https://github.com/poanetwork/blockscout/pull/2175) - fix coinmarketcap response errors -- [#2164](https://github.com/poanetwork/blockscout/pull/2164) - fix large numbers in balance view card -- [#2155](https://github.com/poanetwork/blockscout/pull/2155) - fix pending transaction query -- [#2183](https://github.com/poanetwork/blockscout/pull/2183) - tile content aligning for mobile resolution fix, dai logo fix -- [#2162](https://github.com/poanetwork/blockscout/pull/2162) - contract creation tile color changed -- [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli -- [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli -- [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue -- [#2129](https://github.com/poanetwork/blockscout/pull/2129) - Fix for width of explorer elements -- [#2121](https://github.com/poanetwork/blockscout/pull/2121) - Binding of 404 page -- [#2120](https://github.com/poanetwork/blockscout/pull/2120) - footer links and socials focus color issue -- [#2113](https://github.com/poanetwork/blockscout/pull/2113) - renewed logos for rsk, dai, blockscout; themes color changes for lukso; error images for lukso -- [#2112](https://github.com/poanetwork/blockscout/pull/2112) - themes color improvements, dropdown color issue -- [#2110](https://github.com/poanetwork/blockscout/pull/2110) - themes colors issues, ui issues -- [#2103](https://github.com/poanetwork/blockscout/pull/2103) - ui issues for all themes -- [#2090](https://github.com/poanetwork/blockscout/pull/2090) - updated some ETC theme colors -- [#2096](https://github.com/poanetwork/blockscout/pull/2096) - RSK theme fixes -- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec -- [#2111](https://github.com/poanetwork/blockscout/pull/2111) - improve address transaction controller -- [#2108](https://github.com/poanetwork/blockscout/pull/2108) - fix uncle fetching without full transactions -- [#2128](https://github.com/poanetwork/blockscout/pull/2128) - add new function clause for uncle errors -- [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view -- [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging -- [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation -- [#2148](https://github.com/poanetwork/blockscout/pull/2148) - filter pending logs -- [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum -- [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count -- [#2177](https://github.com/poanetwork/blockscout/pull/2177) - remove duplicate entries from UncleBlock's Fetcher -- [#2169](https://github.com/poanetwork/blockscout/pull/2169) - add more validator reward types for xDai -- [#2173](https://github.com/poanetwork/blockscout/pull/2173) - handle correctly empty transactions -- [#2174](https://github.com/poanetwork/blockscout/pull/2174) - fix reward channel joining -- [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test -- [#2196](https://github.com/poanetwork/blockscout/pull/2196) - Nethermind client fixes -- [#2237](https://github.com/poanetwork/blockscout/pull/2237) - fix rsk total_supply -- [#2198](https://github.com/poanetwork/blockscout/pull/2198) - reduce transaction status and error constraint -- [#2167](https://github.com/poanetwork/blockscout/pull/2167) - feat: document eth rpc api mimicking endpoints -- [#2225](https://github.com/poanetwork/blockscout/pull/2225) - fix metadata decoding in Solidity 0.5.9 smart contract verification -- [#2204](https://github.com/poanetwork/blockscout/pull/2204) - fix large contract verification -- [#2258](https://github.com/poanetwork/blockscout/pull/2258) - reduce BlocksTransactionsMismatch memory footprint -- [#2247](https://github.com/poanetwork/blockscout/pull/2247) - hide logs search if there are no logs -- [#2248](https://github.com/poanetwork/blockscout/pull/2248) - sort block after query execution for average block time -- [#2249](https://github.com/poanetwork/blockscout/pull/2249) - More transaction controllers improvements -- [#2267](https://github.com/poanetwork/blockscout/pull/2267) - Modify implementation of `where_transaction_has_multiple_internal_transactions` -- [#2270](https://github.com/poanetwork/blockscout/pull/2270) - Remove duplicate params in `Indexer.Fetcher.TokenBalance` -- [#2268](https://github.com/poanetwork/blockscout/pull/2268) - remove not existing assigns in html code -- [#2276](https://github.com/poanetwork/blockscout/pull/2276) - remove port in docs +- [#2290](https://github.com/poanetwork/blockscout/pull/2290) - Add eth_get_balance.json to AddressView's render +- [#2286](https://github.com/poanetwork/blockscout/pull/2286) - banner stats issues on sm resolutions, transactions title issue +- [#2284](https://github.com/poanetwork/blockscout/pull/2284) - add 404 status for not existing pages +- [#2244](https://github.com/poanetwork/blockscout/pull/2244) - fix internal transactions failing to be indexed because of constraint +- [#2281](https://github.com/poanetwork/blockscout/pull/2281) - typo issues, dropdown issues +- [#2278](https://github.com/poanetwork/blockscout/pull/2278) - increase threshold for scientific notation +- [#2275](https://github.com/poanetwork/blockscout/pull/2275) - Description for networks selector +- [#2263](https://github.com/poanetwork/blockscout/pull/2263) - added an ability to close network selector on outside click +- [#2257](https://github.com/poanetwork/blockscout/pull/2257) - 'download csv' button added to different tabs +- [#2242](https://github.com/poanetwork/blockscout/pull/2242) - added styles for 'download csv' button +- [#2261](https://github.com/poanetwork/blockscout/pull/2261) - header logo aligned to the center properly +- [#2254](https://github.com/poanetwork/blockscout/pull/2254) - search length issue, tile link wrapping issue +- [#2238](https://github.com/poanetwork/blockscout/pull/2238) - header content alignment issue, hide navbar on outside click +- [#2229](https://github.com/poanetwork/blockscout/pull/2229) - gap issue between qr and copy button in token transfers, top cards width and height issue +- [#2201](https://github.com/poanetwork/blockscout/pull/2201) - footer columns fix +- [#2179](https://github.com/poanetwork/blockscout/pull/2179) - fix docker build error +- [#2165](https://github.com/poanetwork/blockscout/pull/2165) - sort blocks by timestamp when calculating average block time +- [#2175](https://github.com/poanetwork/blockscout/pull/2175) - fix coinmarketcap response errors +- [#2164](https://github.com/poanetwork/blockscout/pull/2164) - fix large numbers in balance view card +- [#2155](https://github.com/poanetwork/blockscout/pull/2155) - fix pending transaction query +- [#2183](https://github.com/poanetwork/blockscout/pull/2183) - tile content aligning for mobile resolution fix, dai logo fix +- [#2162](https://github.com/poanetwork/blockscout/pull/2162) - contract creation tile color changed +- [#2144](https://github.com/poanetwork/blockscout/pull/2144) - 'page not found' images path fixed for goerli +- [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli +- [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue +- [#2129](https://github.com/poanetwork/blockscout/pull/2129) - Fix for width of explorer elements +- [#2121](https://github.com/poanetwork/blockscout/pull/2121) - Binding of 404 page +- [#2120](https://github.com/poanetwork/blockscout/pull/2120) - footer links and socials focus color issue +- [#2113](https://github.com/poanetwork/blockscout/pull/2113) - renewed logos for rsk, dai, blockscout; themes color changes for lukso; error images for lukso +- [#2112](https://github.com/poanetwork/blockscout/pull/2112) - themes color improvements, dropdown color issue +- [#2110](https://github.com/poanetwork/blockscout/pull/2110) - themes colors issues, ui issues +- [#2103](https://github.com/poanetwork/blockscout/pull/2103) - ui issues for all themes +- [#2090](https://github.com/poanetwork/blockscout/pull/2090) - updated some ETC theme colors +- [#2096](https://github.com/poanetwork/blockscout/pull/2096) - RSK theme fixes +- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec +- [#2111](https://github.com/poanetwork/blockscout/pull/2111) - improve address transaction controller +- [#2108](https://github.com/poanetwork/blockscout/pull/2108) - fix uncle fetching without full transactions +- [#2128](https://github.com/poanetwork/blockscout/pull/2128) - add new function clause for uncle errors +- [#2123](https://github.com/poanetwork/blockscout/pull/2123) - fix coins percentage view +- [#2119](https://github.com/poanetwork/blockscout/pull/2119) - fix map logging +- [#2130](https://github.com/poanetwork/blockscout/pull/2130) - fix navigation +- [#2148](https://github.com/poanetwork/blockscout/pull/2148) - filter pending logs +- [#2147](https://github.com/poanetwork/blockscout/pull/2147) - add rsk format of checksum +- [#2149](https://github.com/poanetwork/blockscout/pull/2149) - remove pending transaction count +- [#2177](https://github.com/poanetwork/blockscout/pull/2177) - remove duplicate entries from UncleBlock's Fetcher +- [#2169](https://github.com/poanetwork/blockscout/pull/2169) - add more validator reward types for xDai +- [#2173](https://github.com/poanetwork/blockscout/pull/2173) - handle correctly empty transactions +- [#2174](https://github.com/poanetwork/blockscout/pull/2174) - fix reward channel joining +- [#2186](https://github.com/poanetwork/blockscout/pull/2186) - fix net version test +- [#2196](https://github.com/poanetwork/blockscout/pull/2196) - Nethermind client fixes +- [#2237](https://github.com/poanetwork/blockscout/pull/2237) - fix rsk total_supply +- [#2198](https://github.com/poanetwork/blockscout/pull/2198) - reduce transaction status and error constraint +- [#2167](https://github.com/poanetwork/blockscout/pull/2167) - feat: document eth rpc api mimicking endpoints +- [#2225](https://github.com/poanetwork/blockscout/pull/2225) - fix metadata decoding in Solidity 0.5.9 smart contract verification +- [#2204](https://github.com/poanetwork/blockscout/pull/2204) - fix large contract verification +- [#2258](https://github.com/poanetwork/blockscout/pull/2258) - reduce BlocksTransactionsMismatch memory footprint +- [#2247](https://github.com/poanetwork/blockscout/pull/2247) - hide logs search if there are no logs +- [#2248](https://github.com/poanetwork/blockscout/pull/2248) - sort block after query execution for average block time +- [#2249](https://github.com/poanetwork/blockscout/pull/2249) - More transaction controllers improvements +- [#2267](https://github.com/poanetwork/blockscout/pull/2267) - Modify implementation of `where_transaction_has_multiple_internal_transactions` +- [#2270](https://github.com/poanetwork/blockscout/pull/2270) - Remove duplicate params in `Indexer.Fetcher.TokenBalance` +- [#2268](https://github.com/poanetwork/blockscout/pull/2268) - remove not existing assigns in html code +- [#2276](https://github.com/poanetwork/blockscout/pull/2276) - remove port in docs ### Chore +- [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version +- [#2118](https://github.com/poanetwork/blockscout/pull/2118) - show only the last decompiled contract +- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - upgrade elixir version to 1.9.0 +- [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver -- [#2127](https://github.com/poanetwork/blockscout/pull/2127) - use previouse chromedriver version -- [#2118](https://github.com/poanetwork/blockscout/pull/2118) - show only the last decompiled contract -- [#2255](https://github.com/poanetwork/blockscout/pull/2255) - upgrade elixir version to 1.9.0 -- [#2256](https://github.com/poanetwork/blockscout/pull/2256) - use the latest version of chromedriver ## 2.0.0-beta ### Features - -- [#2044](https://github.com/poanetwork/blockscout/pull/2044) - New network selector. -- [#2091](https://github.com/poanetwork/blockscout/pull/2091) - Added "Question" modal. -- [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme -- [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page. -- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added -- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" -- [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated -- [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue -- [#1907](https://github.com/poanetwork/blockscout/pull/1907) - dropdown color bug fix (lukso theme) and tooltip color bug fix -- [#1859](https://github.com/poanetwork/blockscout/pull/1859) - feat: show raw transaction traces -- [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc -- [#1957](https://github.com/poanetwork/blockscout/pull/1957) - Calculate stakes ratio before insert pools -- [#1956](https://github.com/poanetwork/blockscout/pull/1956) - add logs tab to address -- [#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 -- [#2036](https://github.com/poanetwork/blockscout/pull/2036) - New tables for staking pools and delegators -- [#1974](https://github.com/poanetwork/blockscout/pull/1974) - feat: previous page button logic -- [#1999](https://github.com/poanetwork/blockscout/pull/1999) - load data async on addresses page -- [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites. -- [#2040](https://github.com/poanetwork/blockscout/pull/2040) - Verification links to other explorers for ETH -- [#2037](https://github.com/poanetwork/blockscout/pull/2037) - add address logs search functionality -- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async -- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups -- [#2100](https://github.com/poanetwork/blockscout/pull/2100) - feat: eth_get_balance rpc endpoint +- [#2044](https://github.com/poanetwork/blockscout/pull/2044) - New network selector. +- [#2091](https://github.com/poanetwork/blockscout/pull/2091) - Added "Question" modal. +- [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme +- [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page. +- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added +- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" +- [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated +- [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue +- [#1907](https://github.com/poanetwork/blockscout/pull/1907) - dropdown color bug fix (lukso theme) and tooltip color bug fix +- [#1859](https://github.com/poanetwork/blockscout/pull/1859) - feat: show raw transaction traces +- [#1941](https://github.com/poanetwork/blockscout/pull/1941) - feat: add on demand fetching and stale attr to rpc +- [#1957](https://github.com/poanetwork/blockscout/pull/1957) - Calculate stakes ratio before insert pools +- [#1956](https://github.com/poanetwork/blockscout/pull/1956) - add logs tab to address +- [#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 +- [#2036](https://github.com/poanetwork/blockscout/pull/2036) - New tables for staking pools and delegators +- [#1974](https://github.com/poanetwork/blockscout/pull/1974) - feat: previous page button logic +- [#1999](https://github.com/poanetwork/blockscout/pull/1999) - load data async on addresses page +- [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites. +- [#2040](https://github.com/poanetwork/blockscout/pull/2040) - Verification links to other explorers for ETH +- [#2037](https://github.com/poanetwork/blockscout/pull/2037) - add address logs search functionality +- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async +- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups +- [#2100](https://github.com/poanetwork/blockscout/pull/2100) - feat: eth_get_balance rpc endpoint ### Fixes - -- [#2228](https://github.com/poanetwork/blockscout/pull/2228) - favorites duplication issues, active radio issue -- [#2207](https://github.com/poanetwork/blockscout/pull/2207) - new 'download csv' button design -- [#2206](https://github.com/poanetwork/blockscout/pull/2206) - added styles for 'Download All Transactions as CSV' button -- [#2099](https://github.com/poanetwork/blockscout/pull/2099) - logs search input width -- [#2098](https://github.com/poanetwork/blockscout/pull/2098) - nav dropdown issue, logo size issue -- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added -- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues -- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs. -- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input -- [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added -- [#2043](https://github.com/poanetwork/blockscout/pull/2043) - Fixed modal dialog width for 'verify other explorers' -- [#2025](https://github.com/poanetwork/blockscout/pull/2025) - Added a new color to display transactions' errors. -- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue -- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes. -- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide. -- [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown. -- [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment -- [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu -- [#1868](https://github.com/poanetwork/blockscout/pull/1868) - fix: logs list endpoint performance -- [#1822](https://github.com/poanetwork/blockscout/pull/1822) - Fix style breaks in decompiled contract code view -- [#1885](https://github.com/poanetwork/blockscout/pull/1885) - highlight reserved words in decompiled code -- [#1896](https://github.com/poanetwork/blockscout/pull/1896) - re-query tokens in top nav automplete -- [#1905](https://github.com/poanetwork/blockscout/pull/1905) - fix reorgs, uncles pagination -- [#1904](https://github.com/poanetwork/blockscout/pull/1904) - fix `BLOCK_COUNT_CACHE_TTL` env var type -- [#1915](https://github.com/poanetwork/blockscout/pull/1915) - fallback to 2 latest evm versions -- [#1937](https://github.com/poanetwork/blockscout/pull/1937) - Check the presence of overlap[i] object before retrieving properties from it -- [#1960](https://github.com/poanetwork/blockscout/pull/1960) - do not remove bold text in decompiled contacts -- [#1966](https://github.com/poanetwork/blockscout/pull/1966) - fix: add fields for contract filter performance -- [#2017](https://github.com/poanetwork/blockscout/pull/2017) - fix: fix to/from filters on tx list pages -- [#2008](https://github.com/poanetwork/blockscout/pull/2008) - add new function clause for xDai network beneficiaries -- [#2009](https://github.com/poanetwork/blockscout/pull/2009) - addresses page improvements -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions -- [#2062](https://github.com/poanetwork/blockscout/pull/2062) - fix: uniq by hash, instead of transaction -- [#2052](https://github.com/poanetwork/blockscout/pull/2052) - allow bytes32 for name and symbol -- [#2047](https://github.com/poanetwork/blockscout/pull/2047) - fix: show creating internal transactions -- [#2014](https://github.com/poanetwork/blockscout/pull/2014) - fix: use better queries for listLogs endpoint -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions -- [#2070](https://github.com/poanetwork/blockscout/pull/2070) - reduce `max_concurrency` of `BlocksTransactionsMismatch` fetcher -- [#2083](https://github.com/poanetwork/blockscout/pull/2083) - allow total_difficuly to be nil -- [#2086](https://github.com/poanetwork/blockscout/pull/2086) - fix geth's staticcall without output +- [#2228](https://github.com/poanetwork/blockscout/pull/2228) - favorites duplication issues, active radio issue +- [#2207](https://github.com/poanetwork/blockscout/pull/2207) - new 'download csv' button design +- [#2206](https://github.com/poanetwork/blockscout/pull/2206) - added styles for 'Download All Transactions as CSV' button +- [#2099](https://github.com/poanetwork/blockscout/pull/2099) - logs search input width +- [#2098](https://github.com/poanetwork/blockscout/pull/2098) - nav dropdown issue, logo size issue +- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added +- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues +- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs. +- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input +- [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added +- [#2043](https://github.com/poanetwork/blockscout/pull/2043) - Fixed modal dialog width for 'verify other explorers' +- [#2025](https://github.com/poanetwork/blockscout/pull/2025) - Added a new color to display transactions' errors. +- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue +- [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes. +- [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide. +- [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown. +- [#1926](https://github.com/poanetwork/blockscout/pull/1926) - status label alignment +- [#1849](https://github.com/poanetwork/blockscout/pull/1849) - Improve chains menu +- [#1868](https://github.com/poanetwork/blockscout/pull/1868) - fix: logs list endpoint performance +- [#1822](https://github.com/poanetwork/blockscout/pull/1822) - Fix style breaks in decompiled contract code view +- [#1885](https://github.com/poanetwork/blockscout/pull/1885) - highlight reserved words in decompiled code +- [#1896](https://github.com/poanetwork/blockscout/pull/1896) - re-query tokens in top nav automplete +- [#1905](https://github.com/poanetwork/blockscout/pull/1905) - fix reorgs, uncles pagination +- [#1904](https://github.com/poanetwork/blockscout/pull/1904) - fix `BLOCK_COUNT_CACHE_TTL` env var type +- [#1915](https://github.com/poanetwork/blockscout/pull/1915) - fallback to 2 latest evm versions +- [#1937](https://github.com/poanetwork/blockscout/pull/1937) - Check the presence of overlap[i] object before retrieving properties from it +- [#1960](https://github.com/poanetwork/blockscout/pull/1960) - do not remove bold text in decompiled contacts +- [#1966](https://github.com/poanetwork/blockscout/pull/1966) - fix: add fields for contract filter performance +- [#2017](https://github.com/poanetwork/blockscout/pull/2017) - fix: fix to/from filters on tx list pages +- [#2008](https://github.com/poanetwork/blockscout/pull/2008) - add new function clause for xDai network beneficiaries +- [#2009](https://github.com/poanetwork/blockscout/pull/2009) - addresses page improvements +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions +- [#2062](https://github.com/poanetwork/blockscout/pull/2062) - fix: uniq by hash, instead of transaction +- [#2052](https://github.com/poanetwork/blockscout/pull/2052) - allow bytes32 for name and symbol +- [#2047](https://github.com/poanetwork/blockscout/pull/2047) - fix: show creating internal transactions +- [#2014](https://github.com/poanetwork/blockscout/pull/2014) - fix: use better queries for listLogs endpoint +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions +- [#2070](https://github.com/poanetwork/blockscout/pull/2070) - reduce `max_concurrency` of `BlocksTransactionsMismatch` fetcher +- [#2083](https://github.com/poanetwork/blockscout/pull/2083) - allow total_difficuly to be nil +- [#2086](https://github.com/poanetwork/blockscout/pull/2086) - fix geth's staticcall without output ### Chore -- [#1900](https://github.com/poanetwork/blockscout/pull/1900) - SUPPORTED_CHAINS ENV var -- [#1958](https://github.com/poanetwork/blockscout/pull/1958) - Default value for release link env var -- [#1964](https://github.com/poanetwork/blockscout/pull/1964) - ALLOWED_EVM_VERSIONS env var -- [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view -- [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI -- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name -- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config -- [#2055](https://github.com/poanetwork/blockscout/pull/2055) - Increase timeout for geth indexers -- [#2069](https://github.com/poanetwork/blockscout/pull/2069) - Docsify integration: static docs page generation +- [#1900](https://github.com/poanetwork/blockscout/pull/1900) - SUPPORTED_CHAINS ENV var +- [#1958](https://github.com/poanetwork/blockscout/pull/1958) - Default value for release link env var +- [#1964](https://github.com/poanetwork/blockscout/pull/1964) - ALLOWED_EVM_VERSIONS env var +- [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view +- [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI +- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name +- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config +- [#2055](https://github.com/poanetwork/blockscout/pull/2055) - Increase timeout for geth indexers +- [#2069](https://github.com/poanetwork/blockscout/pull/2069) - Docsify integration: static docs page generation + ## 1.3.15-beta ### Features -- [#1857](https://github.com/poanetwork/blockscout/pull/1857) - Re-implement Geth JS internal transaction tracer in Elixir -- [#1989](https://github.com/poanetwork/blockscout/pull/1989) - fix: consolidate address w/ balance one at a time -- [#2002](https://github.com/poanetwork/blockscout/pull/2002) - Get estimated count of blocks when cache is empty +- [#1857](https://github.com/poanetwork/blockscout/pull/1857) - Re-implement Geth JS internal transaction tracer in Elixir +- [#1989](https://github.com/poanetwork/blockscout/pull/1989) - fix: consolidate address w/ balance one at a time +- [#2002](https://github.com/poanetwork/blockscout/pull/2002) - Get estimated count of blocks when cache is empty ### Fixes -- [#1869](https://github.com/poanetwork/blockscout/pull/1869) - Fix output and gas extraction in JS tracer for Geth -- [#1992](https://github.com/poanetwork/blockscout/pull/1992) - fix: support https for wobserver polling -- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions +- [#1869](https://github.com/poanetwork/blockscout/pull/1869) - Fix output and gas extraction in JS tracer for Geth +- [#1992](https://github.com/poanetwork/blockscout/pull/1992) - fix: support https for wobserver polling +- [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions + ## 1.3.14-beta -- [#1812](https://github.com/poanetwork/blockscout/pull/1812) - add pagination to addresses page -- [#1920](https://github.com/poanetwork/blockscout/pull/1920) - fix: remove source code fields from list endpoint -- [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks +- [#1812](https://github.com/poanetwork/blockscout/pull/1812) - add pagination to addresses page +- [#1920](https://github.com/poanetwork/blockscout/pull/1920) - fix: remove source code fields from list endpoint +- [#1876](https://github.com/poanetwork/blockscout/pull/1876) - async calculate a count of blocks ### Fixes -- [#1917](https://github.com/poanetwork/blockscout/pull/1917) - Force block refetch if transaction is re-collated in a different block +- [#1917](https://github.com/poanetwork/blockscout/pull/1917) - Force block refetch if transaction is re-collated in a different block ### Chore -- [#1892](https://github.com/poanetwork/blockscout/pull/1892) - Remove temporary worker modules +- [#1892](https://github.com/poanetwork/blockscout/pull/1892) - Remove temporary worker modules + ## 1.3.13-beta ### Features -- [#1933](https://github.com/poanetwork/blockscout/pull/1933) - add eth_BlockNumber json rpc method +- [#1933](https://github.com/poanetwork/blockscout/pull/1933) - add eth_BlockNumber json rpc method ### Fixes -- [#1875](https://github.com/poanetwork/blockscout/pull/1875) - fix: resolve false positive constructor arguments -- [#1881](https://github.com/poanetwork/blockscout/pull/1881) - fix: store solc versions locally for performance -- [#1898](https://github.com/poanetwork/blockscout/pull/1898) - check if the constructor has arguments before verifying constructor arguments +- [#1875](https://github.com/poanetwork/blockscout/pull/1875) - fix: resolve false positive constructor arguments +- [#1881](https://github.com/poanetwork/blockscout/pull/1881) - fix: store solc versions locally for performance +- [#1898](https://github.com/poanetwork/blockscout/pull/1898) - check if the constructor has arguments before verifying constructor arguments + ## 1.3.12-beta Reverting of synchronous block counter, implemented in #1848 + ## 1.3.11-beta ### Features -- [#1815](https://github.com/poanetwork/blockscout/pull/1815) - Be able to search without prefix "0x" -- [#1813](https://github.com/poanetwork/blockscout/pull/1813) - Add total blocks counter to the main page -- [#1806](https://github.com/poanetwork/blockscout/pull/1806) - Verify contracts with a post request -- [#1848](https://github.com/poanetwork/blockscout/pull/1848) - Add cache for block counter +- [#1815](https://github.com/poanetwork/blockscout/pull/1815) - Be able to search without prefix "0x" +- [#1813](https://github.com/poanetwork/blockscout/pull/1813) - Add total blocks counter to the main page +- [#1806](https://github.com/poanetwork/blockscout/pull/1806) - Verify contracts with a post request +- [#1848](https://github.com/poanetwork/blockscout/pull/1848) - Add cache for block counter ### Fixes -- [#1829](https://github.com/poanetwork/blockscout/pull/1829) - Handle nil quantities in block decoding routine -- [#1830](https://github.com/poanetwork/blockscout/pull/1830) - Make block size field nullable -- [#1840](https://github.com/poanetwork/blockscout/pull/1840) - Handle case when total supply is nil -- [#1838](https://github.com/poanetwork/blockscout/pull/1838) - Block counter calculates only consensus blocks +- [#1829](https://github.com/poanetwork/blockscout/pull/1829) - Handle nil quantities in block decoding routine +- [#1830](https://github.com/poanetwork/blockscout/pull/1830) - Make block size field nullable +- [#1840](https://github.com/poanetwork/blockscout/pull/1840) - Handle case when total supply is nil +- [#1838](https://github.com/poanetwork/blockscout/pull/1838) - Block counter calculates only consensus blocks ### Chore -- [#1814](https://github.com/poanetwork/blockscout/pull/1814) - Clear build artefacts script -- [#1837](https://github.com/poanetwork/blockscout/pull/1837) - Add -f flag to clear_build.sh script delete static folder +- [#1814](https://github.com/poanetwork/blockscout/pull/1814) - Clear build artefacts script +- [#1837](https://github.com/poanetwork/blockscout/pull/1837) - Add -f flag to clear_build.sh script delete static folder + ## 1.3.10-beta ### Features -- [#1739](https://github.com/poanetwork/blockscout/pull/1739) - highlight decompiled source code -- [#1696](https://github.com/poanetwork/blockscout/pull/1696) - full-text search by tokens -- [#1742](https://github.com/poanetwork/blockscout/pull/1742) - Support RSK -- [#1777](https://github.com/poanetwork/blockscout/pull/1777) - show ERC-20 token transfer info on transaction page -- [#1770](https://github.com/poanetwork/blockscout/pull/1770) - set a websocket keepalive from config -- [#1789](https://github.com/poanetwork/blockscout/pull/1789) - add ERC-721 info to transaction overview page -- [#1801](https://github.com/poanetwork/blockscout/pull/1801) - Staking pools fetching +- [#1739](https://github.com/poanetwork/blockscout/pull/1739) - highlight decompiled source code +- [#1696](https://github.com/poanetwork/blockscout/pull/1696) - full-text search by tokens +- [#1742](https://github.com/poanetwork/blockscout/pull/1742) - Support RSK +- [#1777](https://github.com/poanetwork/blockscout/pull/1777) - show ERC-20 token transfer info on transaction page +- [#1770](https://github.com/poanetwork/blockscout/pull/1770) - set a websocket keepalive from config +- [#1789](https://github.com/poanetwork/blockscout/pull/1789) - add ERC-721 info to transaction overview page +- [#1801](https://github.com/poanetwork/blockscout/pull/1801) - Staking pools fetching ### Fixes -- [#1724](https://github.com/poanetwork/blockscout/pull/1724) - Remove internal tx and token balance fetching from realtime fetcher -- [#1727](https://github.com/poanetwork/blockscout/pull/1727) - add logs pagination in rpc api -- [#1740](https://github.com/poanetwork/blockscout/pull/1740) - fix empty block time -- [#1743](https://github.com/poanetwork/blockscout/pull/1743) - sort decompiled smart contracts in lexicographical order -- [#1756](https://github.com/poanetwork/blockscout/pull/1756) - add today's token balance from the previous value -- [#1769](https://github.com/poanetwork/blockscout/pull/1769) - add timestamp to block overview -- [#1768](https://github.com/poanetwork/blockscout/pull/1768) - fix first block parameter -- [#1778](https://github.com/poanetwork/blockscout/pull/1778) - Make websocket optional for realtime fetcher -- [#1790](https://github.com/poanetwork/blockscout/pull/1790) - fix constructor arguments verification -- [#1793](https://github.com/poanetwork/blockscout/pull/1793) - fix top nav autocomplete -- [#1795](https://github.com/poanetwork/blockscout/pull/1795) - fix line numbers for decompiled contracts -- [#1803](https://github.com/poanetwork/blockscout/pull/1803) - use coinmarketcap for total_supply by default -- [#1802](https://github.com/poanetwork/blockscout/pull/1802) - make coinmarketcap's number of pages configurable -- [#1799](https://github.com/poanetwork/blockscout/pull/1799) - Use eth_getUncleByBlockHashAndIndex for uncle block fetching -- [#1531](https://github.com/poanetwork/blockscout/pull/1531) - docker: fix dockerFile for secp256k1 building -- [#1835](https://github.com/poanetwork/blockscout/pull/1835) - fix: ignore `pong` messages without error + - [#1724](https://github.com/poanetwork/blockscout/pull/1724) - Remove internal tx and token balance fetching from realtime fetcher + - [#1727](https://github.com/poanetwork/blockscout/pull/1727) - add logs pagination in rpc api + - [#1740](https://github.com/poanetwork/blockscout/pull/1740) - fix empty block time + - [#1743](https://github.com/poanetwork/blockscout/pull/1743) - sort decompiled smart contracts in lexicographical order + - [#1756](https://github.com/poanetwork/blockscout/pull/1756) - add today's token balance from the previous value + - [#1769](https://github.com/poanetwork/blockscout/pull/1769) - add timestamp to block overview + - [#1768](https://github.com/poanetwork/blockscout/pull/1768) - fix first block parameter + - [#1778](https://github.com/poanetwork/blockscout/pull/1778) - Make websocket optional for realtime fetcher + - [#1790](https://github.com/poanetwork/blockscout/pull/1790) - fix constructor arguments verification + - [#1793](https://github.com/poanetwork/blockscout/pull/1793) - fix top nav autocomplete + - [#1795](https://github.com/poanetwork/blockscout/pull/1795) - fix line numbers for decompiled contracts + - [#1803](https://github.com/poanetwork/blockscout/pull/1803) - use coinmarketcap for total_supply by default + - [#1802](https://github.com/poanetwork/blockscout/pull/1802) - make coinmarketcap's number of pages configurable + - [#1799](https://github.com/poanetwork/blockscout/pull/1799) - Use eth_getUncleByBlockHashAndIndex for uncle block fetching + - [#1531](https://github.com/poanetwork/blockscout/pull/1531) - docker: fix dockerFile for secp256k1 building + - [#1835](https://github.com/poanetwork/blockscout/pull/1835) - fix: ignore `pong` messages without error ### Chore -- [#1804](https://github.com/poanetwork/blockscout/pull/1804) - (Chore) Divide chains by Mainnet/Testnet in menu -- [#1783](https://github.com/poanetwork/blockscout/pull/1783) - Update README with the chains that use Blockscout -- [#1780](https://github.com/poanetwork/blockscout/pull/1780) - Update link to the Github repo in the footer -- [#1757](https://github.com/poanetwork/blockscout/pull/1757) - Change twitter acc link to official Blockscout acc twitter -- [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link -- [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree -- [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab -- [#1744](https://github.com/poanetwork/blockscout/pull/1744) - remove `0x0..0` from tests -- [#1763](https://github.com/poanetwork/blockscout/pull/1763) - Describe indexer structure and list existing fetchers -- [#1800](https://github.com/poanetwork/blockscout/pull/1800) - Disable lazy logging check in Credo + - [#1804](https://github.com/poanetwork/blockscout/pull/1804) - (Chore) Divide chains by Mainnet/Testnet in menu + - [#1783](https://github.com/poanetwork/blockscout/pull/1783) - Update README with the chains that use Blockscout + - [#1780](https://github.com/poanetwork/blockscout/pull/1780) - Update link to the Github repo in the footer + - [#1757](https://github.com/poanetwork/blockscout/pull/1757) - Change twitter acc link to official Blockscout acc twitter + - [#1749](https://github.com/poanetwork/blockscout/pull/1749) - Replace the link in the footer with the official POA announcements tg channel link + - [#1718](https://github.com/poanetwork/blockscout/pull/1718) - Flatten indexer module hierarchy and supervisor tree + - [#1753](https://github.com/poanetwork/blockscout/pull/1753) - Add a check mark to decompiled contract tab + - [#1744](https://github.com/poanetwork/blockscout/pull/1744) - remove `0x0..0` from tests + - [#1763](https://github.com/poanetwork/blockscout/pull/1763) - Describe indexer structure and list existing fetchers + - [#1800](https://github.com/poanetwork/blockscout/pull/1800) - Disable lazy logging check in Credo + ## 1.3.9-beta ### Features -- [#1662](https://github.com/poanetwork/blockscout/pull/1662) - allow specifying number of optimization runs -- [#1654](https://github.com/poanetwork/blockscout/pull/1654) - add decompiled code tab -- [#1661](https://github.com/poanetwork/blockscout/pull/1661) - try to compile smart contract with the latest evm version -- [#1665](https://github.com/poanetwork/blockscout/pull/1665) - Add contract verification RPC endpoint. -- [#1706](https://github.com/poanetwork/blockscout/pull/1706) - allow setting update interval for addresses with b + - [#1662](https://github.com/poanetwork/blockscout/pull/1662) - allow specifying number of optimization runs + - [#1654](https://github.com/poanetwork/blockscout/pull/1654) - add decompiled code tab + - [#1661](https://github.com/poanetwork/blockscout/pull/1661) - try to compile smart contract with the latest evm version + - [#1665](https://github.com/poanetwork/blockscout/pull/1665) - Add contract verification RPC endpoint. + - [#1706](https://github.com/poanetwork/blockscout/pull/1706) - allow setting update interval for addresses with b ### Fixes -- [#1669](https://github.com/poanetwork/blockscout/pull/1669) - do not fail if multiple matching tokens are found -- [#1691](https://github.com/poanetwork/blockscout/pull/1691) - decrease token metadata update interval -- [#1688](https://github.com/poanetwork/blockscout/pull/1688) - do not fail if failure reason is atom -- [#1692](https://github.com/poanetwork/blockscout/pull/1692) - exclude decompiled smart contract from encoding -- [#1684](https://github.com/poanetwork/blockscout/pull/1684) - Discard child block with parent_hash not matching hash of imported block -- [#1699](https://github.com/poanetwork/blockscout/pull/1699) - use seconds as transaction cache period measure -- [#1697](https://github.com/poanetwork/blockscout/pull/1697) - fix failing in rpc if balance is empty -- [#1711](https://github.com/poanetwork/blockscout/pull/1711) - rescue failing repo in block number cache update -- [#1712](https://github.com/poanetwork/blockscout/pull/1712) - do not set contract code from transaction input -- [#1714](https://github.com/poanetwork/blockscout/pull/1714) - fix average block time calculation + - [#1669](https://github.com/poanetwork/blockscout/pull/1669) - do not fail if multiple matching tokens are found + - [#1691](https://github.com/poanetwork/blockscout/pull/1691) - decrease token metadata update interval + - [#1688](https://github.com/poanetwork/blockscout/pull/1688) - do not fail if failure reason is atom + - [#1692](https://github.com/poanetwork/blockscout/pull/1692) - exclude decompiled smart contract from encoding + - [#1684](https://github.com/poanetwork/blockscout/pull/1684) - Discard child block with parent_hash not matching hash of imported block + - [#1699](https://github.com/poanetwork/blockscout/pull/1699) - use seconds as transaction cache period measure + - [#1697](https://github.com/poanetwork/blockscout/pull/1697) - fix failing in rpc if balance is empty + - [#1711](https://github.com/poanetwork/blockscout/pull/1711) - rescue failing repo in block number cache update + - [#1712](https://github.com/poanetwork/blockscout/pull/1712) - do not set contract code from transaction input + - [#1714](https://github.com/poanetwork/blockscout/pull/1714) - fix average block time calculation ### Chore -- [#1693](https://github.com/poanetwork/blockscout/pull/1693) - Add a checklist to the PR template + - [#1693](https://github.com/poanetwork/blockscout/pull/1693) - Add a checklist to the PR template + ## 1.3.8-beta ### Features -- [#1611](https://github.com/poanetwork/blockscout/pull/1611) - allow setting the first indexing block -- [#1596](https://github.com/poanetwork/blockscout/pull/1596) - add endpoint to create decompiled contracts -- [#1634](https://github.com/poanetwork/blockscout/pull/1634) - add transaction count cache + - [#1611](https://github.com/poanetwork/blockscout/pull/1611) - allow setting the first indexing block + - [#1596](https://github.com/poanetwork/blockscout/pull/1596) - add endpoint to create decompiled contracts + - [#1634](https://github.com/poanetwork/blockscout/pull/1634) - add transaction count cache ### Fixes -- [#1630](https://github.com/poanetwork/blockscout/pull/1630) - (Fix) colour for release link in the footer -- [#1621](https://github.com/poanetwork/blockscout/pull/1621) - Modify query to fetch failed contract creations -- [#1614](https://github.com/poanetwork/blockscout/pull/1614) - Do not fetch burn address token balance -- [#1639](https://github.com/poanetwork/blockscout/pull/1614) - Optimize token holder count updates when importing address current balances -- [#1643](https://github.com/poanetwork/blockscout/pull/1643) - Set internal_transactions_indexed_at for empty blocks -- [#1647](https://github.com/poanetwork/blockscout/pull/1647) - Fix typo in view -- [#1650](https://github.com/poanetwork/blockscout/pull/1650) - Add petersburg evm version to smart contract verifier -- [#1657](https://github.com/poanetwork/blockscout/pull/1657) - Force consensus loss for parent block if its hash mismatches parent_hash + - [#1630](https://github.com/poanetwork/blockscout/pull/1630) - (Fix) colour for release link in the footer + - [#1621](https://github.com/poanetwork/blockscout/pull/1621) - Modify query to fetch failed contract creations + - [#1614](https://github.com/poanetwork/blockscout/pull/1614) - Do not fetch burn address token balance + - [#1639](https://github.com/poanetwork/blockscout/pull/1614) - Optimize token holder count updates when importing address current balances + - [#1643](https://github.com/poanetwork/blockscout/pull/1643) - Set internal_transactions_indexed_at for empty blocks + - [#1647](https://github.com/poanetwork/blockscout/pull/1647) - Fix typo in view + - [#1650](https://github.com/poanetwork/blockscout/pull/1650) - Add petersburg evm version to smart contract verifier + - [#1657](https://github.com/poanetwork/blockscout/pull/1657) - Force consensus loss for parent block if its hash mismatches parent_hash ### Chore + ## 1.3.7-beta ### Features ### Fixes -- [#1615](https://github.com/poanetwork/blockscout/pull/1615) - Add more logging to code fixer process -- [#1613](https://github.com/poanetwork/blockscout/pull/1613) - Fix USD fee value -- [#1577](https://github.com/poanetwork/blockscout/pull/1577) - Add process to fix contract with code -- [#1583](https://github.com/poanetwork/blockscout/pull/1583) - Chunk JSON-RPC batches in case connection times out + - [#1615](https://github.com/poanetwork/blockscout/pull/1615) - Add more logging to code fixer process + - [#1613](https://github.com/poanetwork/blockscout/pull/1613) - Fix USD fee value + - [#1577](https://github.com/poanetwork/blockscout/pull/1577) - Add process to fix contract with code + - [#1583](https://github.com/poanetwork/blockscout/pull/1583) - Chunk JSON-RPC batches in case connection times out ### Chore -- [#1610](https://github.com/poanetwork/blockscout/pull/1610) - Add PIRL to Readme + - [#1610](https://github.com/poanetwork/blockscout/pull/1610) - Add PIRL to Readme + ## 1.3.6-beta ### Features -- [#1589](https://github.com/poanetwork/blockscout/pull/1589) - RPC endpoint to list addresses -- [#1567](https://github.com/poanetwork/blockscout/pull/1567) - Allow setting different configuration just for realtime fetcher -- [#1562](https://github.com/poanetwork/blockscout/pull/1562) - Add incoming transactions count to contract view -- [#1608](https://github.com/poanetwork/blockscout/pull/1608) - Add listcontracts RPC Endpoint + - [#1589](https://github.com/poanetwork/blockscout/pull/1589) - RPC endpoint to list addresses + - [#1567](https://github.com/poanetwork/blockscout/pull/1567) - Allow setting different configuration just for realtime fetcher + - [#1562](https://github.com/poanetwork/blockscout/pull/1562) - Add incoming transactions count to contract view + - [#1608](https://github.com/poanetwork/blockscout/pull/1608) - Add listcontracts RPC Endpoint ### Fixes -- [#1595](https://github.com/poanetwork/blockscout/pull/1595) - Reduce block_rewards in the catchup fetcher -- [#1590](https://github.com/poanetwork/blockscout/pull/1590) - Added guard for fetching blocks with invalid number -- [#1588](https://github.com/poanetwork/blockscout/pull/1588) - Fix usd value on address page -- [#1586](https://github.com/poanetwork/blockscout/pull/1586) - Exact timestamp display -- [#1581](https://github.com/poanetwork/blockscout/pull/1581) - Consider `creates` param when fetching transactions -- [#1559](https://github.com/poanetwork/blockscout/pull/1559) - Change v column type for Transactions table + - [#1595](https://github.com/poanetwork/blockscout/pull/1595) - Reduce block_rewards in the catchup fetcher + - [#1590](https://github.com/poanetwork/blockscout/pull/1590) - Added guard for fetching blocks with invalid number + - [#1588](https://github.com/poanetwork/blockscout/pull/1588) - Fix usd value on address page + - [#1586](https://github.com/poanetwork/blockscout/pull/1586) - Exact timestamp display + - [#1581](https://github.com/poanetwork/blockscout/pull/1581) - Consider `creates` param when fetching transactions + - [#1559](https://github.com/poanetwork/blockscout/pull/1559) - Change v column type for Transactions table ### Chore -- [#1579](https://github.com/poanetwork/blockscout/pull/1579) - Add SpringChain to the list of Additional Chains Utilizing BlockScout -- [#1578](https://github.com/poanetwork/blockscout/pull/1578) - Refine contributing procedure -- [#1572](https://github.com/poanetwork/blockscout/pull/1572) - Add option to disable block rewards in indexer config + - [#1579](https://github.com/poanetwork/blockscout/pull/1579) - Add SpringChain to the list of Additional Chains Utilizing BlockScout + - [#1578](https://github.com/poanetwork/blockscout/pull/1578) - Refine contributing procedure + - [#1572](https://github.com/poanetwork/blockscout/pull/1572) - Add option to disable block rewards in indexer config + ## 1.3.5-beta ### Features -- [#1560](https://github.com/poanetwork/blockscout/pull/1560) - Allow executing smart contract functions in arbitrarily sized batches -- [#1543](https://github.com/poanetwork/blockscout/pull/1543) - Use trace_replayBlockTransactions API for faster tracing -- [#1558](https://github.com/poanetwork/blockscout/pull/1558) - Allow searching by token symbol -- [#1551](https://github.com/poanetwork/blockscout/pull/1551) Exact date and time for Transaction details page -- [#1547](https://github.com/poanetwork/blockscout/pull/1547) - Verify smart contracts with evm versions -- [#1540](https://github.com/poanetwork/blockscout/pull/1540) - Fetch ERC721 token balances if sender is '0x0..0' -- [#1539](https://github.com/poanetwork/blockscout/pull/1539) - Add the link to release in the footer -- [#1519](https://github.com/poanetwork/blockscout/pull/1519) - Create contract methods -- [#1496](https://github.com/poanetwork/blockscout/pull/1496) - Remove dropped/replaced transactions in pending transactions list -- [#1492](https://github.com/poanetwork/blockscout/pull/1492) - Disable usd value for an empty exchange rate -- [#1466](https://github.com/poanetwork/blockscout/pull/1466) - Decoding candidates for unverified contracts + - [#1560](https://github.com/poanetwork/blockscout/pull/1560) - Allow executing smart contract functions in arbitrarily sized batches + - [#1543](https://github.com/poanetwork/blockscout/pull/1543) - Use trace_replayBlockTransactions API for faster tracing + - [#1558](https://github.com/poanetwork/blockscout/pull/1558) - Allow searching by token symbol + - [#1551](https://github.com/poanetwork/blockscout/pull/1551) Exact date and time for Transaction details page + - [#1547](https://github.com/poanetwork/blockscout/pull/1547) - Verify smart contracts with evm versions + - [#1540](https://github.com/poanetwork/blockscout/pull/1540) - Fetch ERC721 token balances if sender is '0x0..0' + - [#1539](https://github.com/poanetwork/blockscout/pull/1539) - Add the link to release in the footer + - [#1519](https://github.com/poanetwork/blockscout/pull/1519) - Create contract methods + - [#1496](https://github.com/poanetwork/blockscout/pull/1496) - Remove dropped/replaced transactions in pending transactions list + - [#1492](https://github.com/poanetwork/blockscout/pull/1492) - Disable usd value for an empty exchange rate + - [#1466](https://github.com/poanetwork/blockscout/pull/1466) - Decoding candidates for unverified contracts ### Fixes - -- [#1545](https://github.com/poanetwork/blockscout/pull/1545) - Fix scheduling of latest block polling in Realtime Fetcher -- [#1554](https://github.com/poanetwork/blockscout/pull/1554) - Encode integer parameters when calling smart contract functions -- [#1537](https://github.com/poanetwork/blockscout/pull/1537) - Fix test that depended on date -- [#1534](https://github.com/poanetwork/blockscout/pull/1534) - Render a nicer error when creator cannot be determined -- [#1527](https://github.com/poanetwork/blockscout/pull/1527) - Add index to value_fetched_at -- [#1518](https://github.com/poanetwork/blockscout/pull/1518) - Select only distinct failed transactions -- [#1516](https://github.com/poanetwork/blockscout/pull/1516) - Fix coin balance params reducer for pending transaction -- [#1511](https://github.com/poanetwork/blockscout/pull/1511) - Set correct log level for production -- [#1510](https://github.com/poanetwork/blockscout/pull/1510) - Fix test that fails every 1st day of the month -- [#1509](https://github.com/poanetwork/blockscout/pull/1509) - Add index to blocks' consensus -- [#1508](https://github.com/poanetwork/blockscout/pull/1508) - Remove duplicated indexes -- [#1505](https://github.com/poanetwork/blockscout/pull/1505) - Use https instead of ssh for absinthe libs -- [#1501](https://github.com/poanetwork/blockscout/pull/1501) - Constructor_arguments must be type `text` -- [#1498](https://github.com/poanetwork/blockscout/pull/1498) - Add index for created_contract_address_hash in transactions -- [#1493](https://github.com/poanetwork/blockscout/pull/1493) - Do not do work in process initialization -- [#1487](https://github.com/poanetwork/blockscout/pull/1487) - Limit geth sync to 128 blocks -- [#1484](https://github.com/poanetwork/blockscout/pull/1484) - Allow decoding input as utf-8 -- [#1479](https://github.com/poanetwork/blockscout/pull/1479) - Remove smoothing from coin balance chart + - [#1545](https://github.com/poanetwork/blockscout/pull/1545) - Fix scheduling of latest block polling in Realtime Fetcher + - [#1554](https://github.com/poanetwork/blockscout/pull/1554) - Encode integer parameters when calling smart contract functions + - [#1537](https://github.com/poanetwork/blockscout/pull/1537) - Fix test that depended on date + - [#1534](https://github.com/poanetwork/blockscout/pull/1534) - Render a nicer error when creator cannot be determined + - [#1527](https://github.com/poanetwork/blockscout/pull/1527) - Add index to value_fetched_at + - [#1518](https://github.com/poanetwork/blockscout/pull/1518) - Select only distinct failed transactions + - [#1516](https://github.com/poanetwork/blockscout/pull/1516) - Fix coin balance params reducer for pending transaction + - [#1511](https://github.com/poanetwork/blockscout/pull/1511) - Set correct log level for production + - [#1510](https://github.com/poanetwork/blockscout/pull/1510) - Fix test that fails every 1st day of the month + - [#1509](https://github.com/poanetwork/blockscout/pull/1509) - Add index to blocks' consensus + - [#1508](https://github.com/poanetwork/blockscout/pull/1508) - Remove duplicated indexes + - [#1505](https://github.com/poanetwork/blockscout/pull/1505) - Use https instead of ssh for absinthe libs + - [#1501](https://github.com/poanetwork/blockscout/pull/1501) - Constructor_arguments must be type `text` + - [#1498](https://github.com/poanetwork/blockscout/pull/1498) - Add index for created_contract_address_hash in transactions + - [#1493](https://github.com/poanetwork/blockscout/pull/1493) - Do not do work in process initialization + - [#1487](https://github.com/poanetwork/blockscout/pull/1487) - Limit geth sync to 128 blocks + - [#1484](https://github.com/poanetwork/blockscout/pull/1484) - Allow decoding input as utf-8 + - [#1479](https://github.com/poanetwork/blockscout/pull/1479) - Remove smoothing from coin balance chart ### Chore - -- - Upgrade elixir to 1.8.1 -- - Dockerfile: remove 1.7.1 version pin FROM bitwalker/alpine-elixir-phoenix -- - Resolve lodash security alert + - [https://github.com/poanetwork/blockscout/pull/1532](https://github.com/poanetwork/blockscout/pull/1532) - Upgrade elixir to 1.8.1 + - [https://github.com/poanetwork/blockscout/pull/1553](https://github.com/poanetwork/blockscout/pull/1553) - Dockerfile: remove 1.7.1 version pin FROM bitwalker/alpine-elixir-phoenix + - [https://github.com/poanetwork/blockscout/pull/1465](https://github.com/poanetwork/blockscout/pull/1465) - Resolve lodash security alert From 690e22cb128e29f1343c19de03a856cb72654c25 Mon Sep 17 00:00:00 2001 From: Ethan van Ballegooyen Date: Thu, 29 Aug 2019 13:17:25 +0200 Subject: [PATCH 284/290] README.md Clean up --- README.md | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 13c50fd838..07ebb18f5d 100644 --- a/README.md +++ b/README.md @@ -28,33 +28,34 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc ## Supported Projects -| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | -| ------------------------------------------------------ | ----------------------------------------------------- | ---------------------------------------------------- | -| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | -| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | -| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | -| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | -| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | -| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | -| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | -| | | [SpringChain](https://explorer.springrole.com/) | -| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | -| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | -| | | [Tenda](https://tenda.network) | -| | | [GoJoy Chain](https://gojoychain.com/) | -| | | [Xerom](https://blocks.xerom.org/) | +| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | +|--------------------------------------------------------|-------------------------------------------------------|----------------------------------------------------| +| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | +| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | +| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | +| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | +| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | +| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | +| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | +| | | [SpringChain](https://explorer.springrole.com/) | +| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | +| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | +| | | [Tenda](https://tenda.network) | +| | | [GoJoy Chain](https://gojoychain.com/) | +| | | [Xerom](https://blocks.xerom.org/) | + Current BlockScout versions for hosted projects are available [on the forum](https://forum.poa.network/t/deployed-instances-on-blockscout-com/1938). ## Getting Started See the [project documentation](https://poanetwork.github.io/blockscout) for instructions: +- [Requirements](https://poanetwork.github.io/blockscout/#/requirements) +- [Ansible deployment](https://poanetwork.github.io/blockscout/#/ansible-deployment) +- [Manual deployment](https://poanetwork.github.io/blockscout/#/manual-deployment) +- [ENV variables](https://poanetwork.github.io/blockscout/#/env-variables) +- [Configuration options](https://poanetwork.github.io/blockscout/#/dev-env) -- [Requirements](https://poanetwork.github.io/blockscout/#/requirements) -- [Ansible deployment](https://poanetwork.github.io/blockscout/#/ansible-deployment) -- [Manual deployment](https://poanetwork.github.io/blockscout/#/manual-deployment) -- [ENV variables](https://poanetwork.github.io/blockscout/#/env-variables) -- [Configuration options](https://poanetwork.github.io/blockscout/#/dev-env) ## Acknowledgements From 255dce417fcb9fac05d5a0750c6592454a198436 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 29 Aug 2019 15:57:41 +0300 Subject: [PATCH 285/290] Update README.md --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 07ebb18f5d..0340496862 100644 --- a/README.md +++ b/README.md @@ -28,21 +28,21 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc ## Supported Projects -| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | -|--------------------------------------------------------|-------------------------------------------------------|----------------------------------------------------| -| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | -| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | -| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | -| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | -| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | -| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | -| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | -| | | [SpringChain](https://explorer.springrole.com/) | -| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | -| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | -| | | [Tenda](https://tenda.network) | -| | | [GoJoy Chain](https://gojoychain.com/) | -| | | [Xerom](https://blocks.xerom.org/) | +| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | **Additional Chains using BlockScout** | +|--------------------------------------------------------|-------------------------------------------------------|------------------------------------------------------|----------------------------------------------------------------| +| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | [Celo Testnet](https://alfajores-blockscout.celo-testnet.org/) | +| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | [Matic Testnet](https://explorer.testnet2.matic.network/) | +| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | | +| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | | +| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | | +| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | | +| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | | +| | | [SpringChain](https://explorer.springrole.com/) | | +| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | | +| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | | +| | | [Tenda](https://tenda.network) | | +| | | [GoJoy Chain](https://gojoychain.com/) | | +| | | [Xerom](https://blocks.xerom.org/) | | Current BlockScout versions for hosted projects are available [on the forum](https://forum.poa.network/t/deployed-instances-on-blockscout-com/1938). From b479aae84a152b02a642ac35a1ab19aa7f817cef Mon Sep 17 00:00:00 2001 From: saneery Date: Thu, 29 Aug 2019 17:17:54 +0300 Subject: [PATCH 286/290] Set not full path to api on ajax queries --- apps/block_scout_web/assets/js/lib/try_api.js | 4 ++-- apps/block_scout_web/assets/js/lib/try_eth_api.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/js/lib/try_api.js b/apps/block_scout_web/assets/js/lib/try_api.js index 02d82a65ef..6c33779f30 100644 --- a/apps/block_scout_web/assets/js/lib/try_api.js +++ b/apps/block_scout_web/assets/js/lib/try_api.js @@ -56,7 +56,7 @@ function handleSuccess (query, xhr, clickedButton) { } function dropDomain (url) { - return url.split('/').slice(1).join('/') + return new URL(url).pathname } // Show 'Try it out' UI for a module/action. @@ -128,7 +128,7 @@ $('button[data-try-api-ui-button-type="execute"]').click(event => { } $.ajax({ - url: '/' + dropDomain(composeRequestUrl(query)), + url: dropDomain(composeRequestUrl(query)), success: (_data, _status, xhr) => { handleSuccess(query, xhr, clickedButton) }, diff --git a/apps/block_scout_web/assets/js/lib/try_eth_api.js b/apps/block_scout_web/assets/js/lib/try_eth_api.js index c59d71dbcc..30299431be 100644 --- a/apps/block_scout_web/assets/js/lib/try_eth_api.js +++ b/apps/block_scout_web/assets/js/lib/try_eth_api.js @@ -45,7 +45,7 @@ function parseInput (input) { } function dropDomain (url) { - return url.split('/').slice(1).join('/') + return new URL(url).pathname } $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { @@ -67,7 +67,7 @@ $('button[data-try-eth-api-ui-button-type="execute"]').click(event => { const url = $('[data-endpoint-url]').attr('data-endpoint-url') $.ajax({ - url: '/' + dropDomain(url), + url: dropDomain(url), type: 'POST', data: JSON.stringify(formData), dataType: 'json', From 085d018b7f59d35e2d59b4636cacce5f1549ffca Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Sun, 1 Sep 2019 23:51:32 +0300 Subject: [PATCH 287/290] Update README.md LUKSO L14 testnet in the list of hosted chains --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0340496862..138ddf18d8 100644 --- a/README.md +++ b/README.md @@ -30,17 +30,17 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc | **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | **Additional Chains using BlockScout** | |--------------------------------------------------------|-------------------------------------------------------|------------------------------------------------------|----------------------------------------------------------------| -| [Aerum](https://blockscout.com/aerum/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | [Celo Testnet](https://alfajores-blockscout.celo-testnet.org/) | -| [Callisto](https://blockscout.com/callisto/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | [Matic Testnet](https://explorer.testnet2.matic.network/) | -| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | | -| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | | -| [POA Core Network](https://blockscout.com/poa/core) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | | -| [RSK](https://blockscout.com/rsk/mainnet) | | [PIRL](http://pirl.es/) | | -| [xDai Chain](https://blockscout.com/poa/dai) | | [SafeChain](https://explorer.safechain.io) | | +| [Callisto](https://blockscout.com/callisto/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | [Celo Testnet](https://alfajores-blockscout.celo-testnet.org/) | +| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | [Matic Testnet](https://explorer.testnet2.matic.network/) | +| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [LUKSO L14 Testnet](https://blockscout.com/lukso/l14) | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | | +| [POA Core Network](https://blockscout.com/poa/core) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | | +| [RSK](https://blockscout.com/rsk/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | | +| [xDai Chain](https://blockscout.com/poa/dai) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | | +| | | [PIRL](http://pirl.es/) | | +| | | [SafeChain](https://explorer.safechain.io) | | | | | [SpringChain](https://explorer.springrole.com/) | | -| | | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | | -| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | | | | | [Tenda](https://tenda.network) | | +| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | | | | | [GoJoy Chain](https://gojoychain.com/) | | | | | [Xerom](https://blocks.xerom.org/) | | From 44cf49ea7580108815d94a1dd72d92f9e246c53d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 2 Sep 2019 09:58:56 +0300 Subject: [PATCH 288/290] fix market_cap calculation --- apps/block_scout_web/lib/block_scout_web/views/chain_view.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex index 506d6ff3c8..528cf3671f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.ChainView do alias BlockScoutWeb.LayoutView defp market_cap(:standard, exchange_rate) do - exchange_rate.market_cap_usd + Decimal.mult(exchange_rate.available_supply, exchange_rate.usd_value) end defp market_cap(module, exchange_rate) do From ff1b7568d6762ec9a2cd84628347f9c2a5d6abb6 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 2 Sep 2019 10:51:14 +0300 Subject: [PATCH 289/290] fix tests --- .../lib/block_scout_web/views/chain_view.ex | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex index 528cf3671f..3033dbc0fe 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex @@ -3,8 +3,13 @@ defmodule BlockScoutWeb.ChainView do alias BlockScoutWeb.LayoutView - defp market_cap(:standard, exchange_rate) do - Decimal.mult(exchange_rate.available_supply, exchange_rate.usd_value) + defp market_cap(:standard, %{available_supply: available_supply, usd_value: usd_value}) + when is_nil(available_supply) or is_nil(usd_value) do + Decimal.new(0) + end + + defp market_cap(:standard, %{available_supply: available_supply, usd_value: usd_value}) do + Decimal.mult(available_supply, usd_value) end defp market_cap(module, exchange_rate) do From d2d99eb60b3170d7f5aa158c150ca7ea3093d510 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 2 Sep 2019 10:57:15 +0300 Subject: [PATCH 290/290] add fallback --- apps/block_scout_web/lib/block_scout_web/views/chain_view.ex | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex index 3033dbc0fe..a5f0ebef50 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/chain_view.ex @@ -12,6 +12,10 @@ defmodule BlockScoutWeb.ChainView do Decimal.mult(available_supply, usd_value) end + defp market_cap(:standard, exchange_rate) do + exchange_rate.market_cap_usd + end + defp market_cap(module, exchange_rate) do module.market_cap(exchange_rate) end