Merge branch 'master' into split-api-and-webapp-routes

CHANGELOG.md

@@ -12,11 +12,13 @@
 - [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page
 
 ### Fixes
+- [#2416](https://github.com/poanetwork/blockscout/pull/2416) - Fix "page not found" handling in the router
 - [#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
 - [#2395](https://github.com/poanetwork/blockscout/pull/2395) - new block loading animation
 - [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used)
+- [#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

apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex

@@ -115,4 +115,6 @@ defmodule BlockScoutWeb.AddressLogsController do
         not_found(conn)
     end
   end
+
+  def search_logs(conn, _), do: not_found(conn)
 end

apps/block_scout_web/lib/block_scout_web/controllers/address_transaction_controller.ex

@@ -130,6 +130,8 @@ defmodule BlockScoutWeb.AddressTransactionController do
     end
   end
 
+  def token_transfers_csv(conn, _), do: not_found(conn)
+
   def transactions_csv(conn, %{"address_id" => address_hash_string}) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
          {:ok, address} <- Chain.hash_to_address(address_hash) do
@@ -149,4 +151,6 @@ defmodule BlockScoutWeb.AddressTransactionController do
         not_found(conn)
     end
   end
+
+  def transactions_csv(conn, _), do: not_found(conn)
 end

apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex

@@ -52,6 +52,8 @@ defmodule BlockScoutWeb.ChainController do
     end
   end
 
+  def search(conn, _), do: not_found(conn)
+
   def token_autocomplete(conn, %{"q" => term}) when is_binary(term) do
     if term == "" do
       json(conn, "{}")

apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex

@@ -30,6 +30,8 @@ defmodule BlockScoutWeb.SmartContractController do
     end
   end
 
+  def index(conn, _), do: not_found(conn)
+
   def show(conn, params) do
     with true <- ajax?(conn),
          {:ok, address_hash} <- Chain.string_to_address_hash(params["id"]),

apps/block_scout_web/lib/block_scout_web/web_router.ex

@@ -199,6 +199,6 @@ defmodule BlockScoutWeb.WebRouter do
 
     get("/chain_blocks", ChainController, :chain_blocks, as: :chain_blocks)
 
-    get("/:page", PageNotFoundController, :index)
+    get("/*path", PageNotFoundController, :index)
   end
 end

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex

@@ -353,4 +353,8 @@ defmodule EthereumJSONRPC.Transaction do
       _ -> {key, quantity_to_integer(chain_id)}
     end
   end
+
+  defp entry_to_elixir(_) do
+    {nil, nil}
+  end
 end

apps/ethereum_jsonrpc/test/ethereum_jsonrpc/transaction_test.exs

@@ -2,4 +2,14 @@ defmodule EthereumJSONRPC.TransactionTest do
   use ExUnit.Case, async: true
 
   doctest EthereumJSONRPC.Transaction
+
+  alias EthereumJSONRPC.Transaction
+
+  describe "to_elixir/1" do
+    test "skips unsupported keys" do
+      map = %{"key" => "value", "key1" => "value1"}
+
+      assert %{nil: nil} = Transaction.to_elixir(map)
+    end
+  end
 end