chore: merge upstream v11.0.2

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: JOY

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 11.0.2
+
+### 🐛 Bug Fixes
+
+- Process empty list of changes on fetching contract codes ((#14312)[https://github.com/blockscout/blockscout/pull/14312])
+- Add fallback for empty "to" in Geth selfdestruct ([#14256](https://github.com/blockscout/blockscout/issues/14256))
+- Trim contractaddresses in getcontractcreation ([#14306](https://github.com/blockscout/blockscout/issues/14306))
+- Adapt maybe_reject_zero_value for empty blocks ([#14309](https://github.com/blockscout/blockscout/issues/14309))
+- Add missing internal transactions address preload ([#14308](https://github.com/blockscout/blockscout/issues/14308))
+- Fix some web tests ([#14310][https://github.com/blockscout/blockscout/pull/14310])
+
+### ⚙️ Miscellaneous Tasks
+
+- Disable on-demand IT fetcher test for rsk and filecoin ([#14314](https://github.com/blockscout/blockscout/pull/14314))
+- Disable flaky contract code compiler doctest ([#14313](https://github.com/blockscout/blockscout/pull/14313))
+- Add coverage for core API v2 views ([#14254](https://github.com/blockscout/blockscout/issues/14254))
+
+
 ## 11.0.1
 
 ### 🐛 Bug Fixes

apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/contract_controller.ex

@@ -45,7 +45,9 @@ defmodule BlockScoutWeb.API.RPC.ContractController do
   def getcontractcreation(conn, %{"contractaddresses" => contract_address_hash_strings} = params) do
     addresses =
       contract_address_hash_strings
-      |> String.split(",")
+      |> String.split(",", trim: true)
+      |> Enum.map(&String.trim/1)
+      |> Enum.reject(&(&1 == ""))
       |> Enum.take(@addresses_limit)
       |> Enum.map(fn address_hash_string ->
         case validate_address(address_hash_string, params) do

apps/block_scout_web/lib/block_scout_web/schemas/api/v2/celo/election_reward.ex

@@ -23,8 +23,7 @@ defmodule BlockScoutWeb.Schemas.API.V2.Celo.ElectionReward do
     required: [
       :amount,
       :account,
-      :associated_account,
-      :epoch_number
+      :associated_account
     ],
     additionalProperties: false
   })

apps/block_scout_web/mix.exs

@@ -19,7 +19,7 @@ defmodule BlockScoutWeb.Mixfile do
       lockfile: "../../mix.lock",
       package: package(),
       start_permanent: Mix.env() == :prod,
-      version: "11.0.1",
+      version: "11.0.2",
       xref: [
         exclude: [
           Explorer.Chain.Beacon.Reader,

apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs

@@ -2499,78 +2499,82 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do
       assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response)
     end
 
-    test "via on-demand fetcher", %{conn: conn} do
-      original_config = Application.get_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions)
+    if Application.compile_env(:explorer, :chain_type) not in [:rsk, :filecoin] do
+      test "via on-demand fetcher", %{conn: conn} do
+        original_config = Application.get_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions)
 
-      Application.put_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions,
-        enabled: true,
-        storage_period: 0
-      )
+        Application.put_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions,
+          enabled: true,
+          storage_period: 0
+        )
 
-      transaction = :transaction |> insert() |> with_block()
-
-      expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
-        [%{id: id, params: _}], _ ->
-          {:ok,
-           [
-             %{
-               id: id,
-               result: %{
-                 "type" => "create",
-                 "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
-                 "to" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
-                 "value" => "0x0",
-                 "gas" => "0x106f5",
-                 "gasUsed" => "0x106f5",
-                 "input" =>
-                   "0x608060405234801561001057600080fd5b50610150806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033",
-                 "output" =>
-                   "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033"
-               }
-             }
-           ]}
-      end)
+        on_exit(fn ->
+          Application.put_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions, original_config)
+        end)
 
-      Application.put_env(:ethereum_jsonrpc, EthereumJSONRPC.Geth, tracer: "call_tracer", debug_trace_timeout: "5s")
+        transaction = :transaction |> insert() |> with_block()
 
-      expected_result = [
-        %{
-          "blockNumber" => "#{transaction.block_number}",
-          "callType" => "",
-          "contractAddress" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
-          "errCode" => "",
-          "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
-          "gas" => "67317",
-          "gasUsed" => "67317",
-          "index" => "0",
-          "input" => "",
-          "isError" => "0",
-          "timeStamp" => "#{DateTime.to_unix(transaction.block.timestamp)}",
-          "to" => "",
-          "transactionHash" => "#{transaction.hash}",
-          "type" => "create",
-          "value" => "0"
-        }
-      ]
-
-      params = %{
-        "module" => "account",
-        "action" => "txlistinternal",
-        "txhash" => "#{transaction.hash}",
-        "include_zero_value" => "true"
-      }
+        expect(EthereumJSONRPC.Mox, :json_rpc, 1, fn
+          [%{id: id, params: _}], _ ->
+            {:ok,
+             [
+               %{
+                 id: id,
+                 result: %{
+                   "type" => "create",
+                   "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
+                   "to" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
+                   "value" => "0x0",
+                   "gas" => "0x106f5",
+                   "gasUsed" => "0x106f5",
+                   "input" =>
+                     "0x608060405234801561001057600080fd5b50610150806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033",
+                   "output" =>
+                     "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80632e64cec11461003b5780636057361d14610059575b600080fd5b610043610075565b60405161005091906100d9565b60405180910390f35b610073600480360381019061006e919061009d565b61007e565b005b60008054905090565b8060008190555050565b60008135905061009781610103565b92915050565b6000602082840312156100b3576100b26100fe565b5b60006100c184828501610088565b91505092915050565b6100d3816100f4565b82525050565b60006020820190506100ee60008301846100ca565b92915050565b6000819050919050565b600080fd5b61010c816100f4565b811461011757600080fd5b5056fea26469706673582212209a159a4f3847890f10bfb87871a61eba91c5dbf5ee3cf6398207e292eee22a1664736f6c63430008070033"
+                 }
+               }
+             ]}
+        end)
 
-      assert response =
-               conn
-               |> get("/api/v1", params)
-               |> json_response(200)
+        Application.put_env(:ethereum_jsonrpc, EthereumJSONRPC.Geth, tracer: "call_tracer", debug_trace_timeout: "5s")
+
+        expected_result = [
+          %{
+            "blockNumber" => "#{transaction.block_number}",
+            "callType" => "",
+            "contractAddress" => "0x205a6b72ce16736c9d87172568a9c0cb9304de0d",
+            "errCode" => "",
+            "from" => "0x117b358218da5a4f647072ddb50ded038ed63d17",
+            "gas" => "67317",
+            "gasUsed" => "67317",
+            "index" => "0",
+            "input" => "",
+            "isError" => "0",
+            "timeStamp" => "#{DateTime.to_unix(transaction.block.timestamp)}",
+            "to" => "",
+            "transactionHash" => "#{transaction.hash}",
+            "type" => "create",
+            "value" => "0"
+          }
+        ]
+
+        params = %{
+          "module" => "account",
+          "action" => "txlistinternal",
+          "txhash" => "#{transaction.hash}",
+          "include_zero_value" => "true"
+        }
 
-      assert response["result"] == expected_result
-      assert response["status"] == "1"
-      assert response["message"] == "OK"
-      assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response)
+        assert response =
+                 conn
+                 |> get("/api/v1", params)
+                 |> json_response(200)
 
-      Application.put_env(:explorer, Explorer.Migrator.DeleteZeroValueInternalTransactions, original_config)
+        assert response["result"] == expected_result
+        assert response["status"] == "1"
+        assert response["message"] == "OK"
+        assert :ok = ExJsonSchema.Validator.validate(txlistinternal_schema(), response)
+      end
     end
   end
 

apps/block_scout_web/test/block_scout_web/controllers/api/rpc/contract_controller_test.exs

@@ -1103,6 +1103,49 @@ defmodule BlockScoutWeb.API.RPC.ContractControllerTest do
       assert creation_bytecode == to_string(transaction.input)
     end
 
+    test "returns contract creation info for addresses separated by comma and whitespace", %{conn: conn, params: params} do
+      {:ok, block_timestamp, _} = DateTime.from_iso8601("2021-05-05T21:42:11.000000Z")
+
+      address = insert(:contract_address)
+      address_1 = insert(:contract_address)
+
+      transaction =
+        insert(:transaction,
+          created_contract_address: address,
+          block_timestamp: block_timestamp
+        )
+
+      transaction_1 =
+        insert(:transaction,
+          created_contract_address: address_1,
+          block_timestamp: block_timestamp
+        )
+
+      %{
+        "status" => "1",
+        "message" => "OK",
+        "result" => result
+      } =
+        conn
+        |> get(
+          "/api",
+          Map.put(params, "contractaddresses", "#{to_string(address)}, #{to_string(address_1)}")
+        )
+        |> json_response(200)
+
+      assert length(result) == 2
+
+      assert Enum.map(result, & &1["contractAddress"]) == [
+               to_string(address.hash),
+               to_string(address_1.hash)
+             ]
+
+      assert Enum.map(result, & &1["txHash"]) == [
+               to_string(transaction.hash),
+               to_string(transaction_1.hash)
+             ]
+    end
+
     test "get contract creation info via internal transaction", %{conn: conn, params: params} do
       {:ok, block_timestamp, _} = DateTime.from_iso8601("2021-05-05T21:42:11.000000Z")
       unix_timestamp = DateTime.to_unix(block_timestamp, :second)

apps/block_scout_web/test/block_scout_web/views/api/v2/address_view_test.exs

@@ -0,0 +1,67 @@
+defmodule BlockScoutWeb.API.V2.AddressViewTest do
+  use BlockScoutWeb.ConnCase, async: true
+
+  alias BlockScoutWeb.API.V2.AddressView
+  alias Explorer.Chain.Wei
+
+  describe "prepare_coin_balance_history_entry/1" do
+    test "returns map with expected keys and values" do
+      block_timestamp = ~U[2023-01-01 00:00:00Z]
+      delta = Decimal.new(100)
+      value = Decimal.new(200)
+
+      coin_balance = %{
+        transaction_hash: nil,
+        block_number: 10,
+        delta: delta,
+        value: value,
+        block_timestamp: block_timestamp
+      }
+
+      result = AddressView.prepare_coin_balance_history_entry(coin_balance)
+
+      assert result["transaction_hash"] == nil
+      assert result["block_number"] == 10
+      assert Decimal.equal?(result["delta"], delta)
+      assert Decimal.equal?(result["value"], value)
+      assert result["block_timestamp"] == block_timestamp
+    end
+  end
+
+  describe "prepare_coin_balance_history_by_day_entry/1" do
+    test "returns date and value" do
+      value = Decimal.new(500)
+      coin_balance_by_day = %{date: ~D[2023-01-01], value: value}
+
+      result = AddressView.prepare_coin_balance_history_by_day_entry(coin_balance_by_day)
+
+      assert result["date"] == ~D[2023-01-01]
+      assert Decimal.equal?(result["value"], value)
+    end
+  end
+
+  describe "prepare_address_for_list/1" do
+    test "includes coin balance and transaction count" do
+      address =
+        build(:address,
+          fetched_coin_balance: %Wei{value: Decimal.new(100)},
+          transactions_count: 5
+        )
+
+      result = AddressView.prepare_address_for_list(address)
+
+      assert Decimal.equal?(result[:coin_balance], Decimal.new(100))
+      assert result[:transactions_count] == "5"
+      assert Map.has_key?(result, "hash")
+    end
+
+    test "sets coin balance to nil when fetched coin balance is missing" do
+      address = build(:address, fetched_coin_balance: nil, transactions_count: 3)
+
+      result = AddressView.prepare_address_for_list(address)
+
+      assert result[:coin_balance] == nil
+      assert result[:transactions_count] == "3"
+    end
+  end
+end

apps/block_scout_web/test/block_scout_web/views/api/v2/api_view_test.exs

@@ -0,0 +1,25 @@
+defmodule BlockScoutWeb.API.V2.ApiViewTest do
+  use BlockScoutWeb.ConnCase, async: true
+
+  alias BlockScoutWeb.API.V2.ApiView
+
+  describe "render/2" do
+    test "renders message.json" do
+      assert %{"message" => "ok"} = ApiView.render("message.json", %{message: "ok"})
+    end
+
+    test "renders smart_contract_audit_report_changeset_errors.json" do
+      changeset =
+        {%{}, %{audit_report_url: :string}}
+        |> Ecto.Changeset.cast(%{}, [])
+        |> Ecto.Changeset.add_error(:audit_report_url, "can't be blank")
+
+      result =
+        ApiView.render("smart_contract_audit_report_changeset_errors.json", %{changeset: changeset})
+
+      assert result["message"] == "Error on inserting audit report"
+      assert is_map(result["errors"])
+      assert map_size(result["errors"]) > 0
+    end
+  end
+end