update blockscout for gemini-3h with latest upstream changes

.github/workflows/deploy-subspace.yml

@@ -11,7 +11,8 @@ on:
 env:
   TAG_NAME: subspace
   OTP_VERSION: "25.2.1"
-  ELIXIR_VERSION: "1.14.3"
+  ELIXIR_VERSION: "1.14.5"
+  RELEASE_VERSION: "6.2.0"
 
 # concurrency:
 #   group: ${{ github.workflow }}-${{ github.ref }}
@@ -20,18 +21,19 @@ env:
 jobs:
   publish_image:
     name: Publish Docker image
-    env:
-      RELEASE_VERSION: 5.2.3
     runs-on: ubuntu-latest
+    outputs:
+      release-version: ${{ steps.output-step.outputs.release-version }}
+      short-sha: ${{ steps.output-step.outputs.short-sha }}
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # Will automatically make nice tags, see the table here https://github.com/docker/metadata-action#basic
       - name: Docker meta
@@ -50,8 +52,8 @@ jobs:
       - name: Add SHORT_SHA env property with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
 
-      - name: Build and push
-        uses: docker/build-push-action@v3
+      - name: Build and push Docker image for backend
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile
@@ -75,5 +77,5 @@ jobs:
             AMPLITUDE_URL=
             AMPLITUDE_API_KEY=
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}

apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex

@@ -114,6 +114,24 @@ defmodule BlockScoutWeb.API.V2.BlockView do
         end
       end
 
+    "ethereum" ->
+      defp chain_type_fields(result, block, single_block?) do
+        if single_block? do
+          blob_gas_price = Block.transaction_blob_gas_price(block.transactions)
+          burnt_blob_transaction_fees = Decimal.mult(block.blob_gas_used || 0, blob_gas_price || 0)
+
+          result
+          |> Map.put("blob_gas_used", block.blob_gas_used)
+          |> Map.put("excess_blob_gas", block.excess_blob_gas)
+          |> Map.put("blob_gas_price", blob_gas_price)
+          |> Map.put("burnt_blob_fees", burnt_blob_transaction_fees)
+        else
+          result
+          |> Map.put("blob_gas_used", block.blob_gas_used)
+          |> Map.put("excess_blob_gas", block.excess_blob_gas)
+        end
+      end
+
     _ ->
       defp chain_type_fields(result, _block, _single_block?) do
         result

apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex

@@ -533,7 +533,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
           "nonce" => transaction.wrapped_nonce,
           "to" =>
             Helper.address_with_info(
-              single_tx? && conn,
+              conn,
               transaction.wrapped_to_address,
               transaction.wrapped_to_address_hash,
               single_tx?,

apps/block_scout_web/test/test_helper.exs

@@ -31,6 +31,7 @@ Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.PolygonZkevm, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Shibarium, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Suave, :manual)
+Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Beacon, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.BridgedTokens, :manual)
 Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Filecoin, :manual)
 

apps/explorer/config/dev.exs

@@ -23,6 +23,8 @@ config :explorer, Explorer.Repo.Shibarium, timeout: :timer.seconds(80)
 
 config :explorer, Explorer.Repo.Suave, timeout: :timer.seconds(80)
 
+config :explorer, Explorer.Repo.Beacon, timeout: :timer.seconds(80)
+
 config :explorer, Explorer.Repo.BridgedTokens, timeout: :timer.seconds(80)
 
 config :explorer, Explorer.Repo.Filecoin, timeout: :timer.seconds(80)

apps/explorer/config/prod.exs

@@ -36,6 +36,10 @@ config :explorer, Explorer.Repo.Suave,
   prepare: :unnamed,
   timeout: :timer.seconds(60)
 
+config :explorer, Explorer.Repo.Beacon,
+  prepare: :unnamed,
+  timeout: :timer.seconds(60)
+
 config :explorer, Explorer.Repo.BridgedTokens,
   prepare: :unnamed,
   timeout: :timer.seconds(60)

apps/explorer/config/test.exs

@@ -44,6 +44,7 @@ config :explorer, Explorer.Repo.Account,
   log: false
 
 for repo <- [
+      Explorer.Repo.Beacon,
       Explorer.Repo.PolygonEdge,
       Explorer.Repo.PolygonZkevm,
       Explorer.Repo.RSK,

apps/explorer/lib/explorer/application.ex

@@ -141,6 +141,7 @@ defmodule Explorer.Application do
   defp repos_by_chain_type do
     if Mix.env() == :test do
       [
+        Explorer.Repo.Beacon,
         Explorer.Repo.PolygonEdge,
         Explorer.Repo.PolygonZkevm,
         Explorer.Repo.RSK,

apps/explorer/lib/explorer/chain/block.ex

@@ -5,6 +5,15 @@ defmodule Explorer.Chain.Block.Schema do
   alias Explorer.Chain.Block.{Reward, SecondDegreeRelation}
 
   @chain_type_fields (case Application.compile_env(:explorer, :chain_type) do
+                        "ethereum" ->
+                          elem(
+                            quote do
+                              field(:blob_gas_used, :decimal)
+                              field(:excess_blob_gas, :decimal)
+                            end,
+                            2
+                          )
+
                         "rsk" ->
                           elem(
                             quote do
@@ -147,36 +156,6 @@ defmodule Explorer.Chain.Block do
   """
   Explorer.Chain.Block.Schema.generate()
 
-    if Application.compile_env(:explorer, :chain_type) == "rsk" do
-      field(:bitcoin_merged_mining_header, :binary)
-      field(:bitcoin_merged_mining_coinbase_transaction, :binary)
-      field(:bitcoin_merged_mining_merkle_proof, :binary)
-      field(:hash_for_merged_mining, :binary)
-      field(:minimum_gas_price, :decimal)
-    end
-
-    timestamps()
-
-    belongs_to(:miner, Address, foreign_key: :miner_hash, references: :hash, type: Hash.Address)
-
-    has_many(:nephew_relations, SecondDegreeRelation, foreign_key: :uncle_hash)
-    has_many(:nephews, through: [:nephew_relations, :nephew])
-
-    belongs_to(:parent, __MODULE__, foreign_key: :parent_hash, references: :hash, type: Hash.Full)
-
-    has_many(:uncle_relations, SecondDegreeRelation, foreign_key: :nephew_hash)
-    has_many(:uncles, through: [:uncle_relations, :uncle])
-
-    has_many(:transactions, Transaction)
-    has_many(:transaction_forks, Transaction.Fork, foreign_key: :uncle_hash)
-
-    has_many(:rewards, Reward, foreign_key: :block_hash)
-
-    has_many(:withdrawals, Withdrawal, foreign_key: :block_hash)
-
-    has_one(:pending_operations, PendingBlockOperation, foreign_key: :block_hash)
-  end
-
   def changeset(%__MODULE__{} = block, attrs) do
     block
     |> cast(attrs, @required_attrs ++ @optional_attrs)
@@ -306,9 +285,6 @@ defmodule Explorer.Chain.Block do
     end
   end
 
-  defp base_fee_per_gas_to_wei(%Wei{} = wei), do: wei
-  defp base_fee_per_gas_to_wei(base_fee_per_gas), do: %Wei{value: Decimal.new(base_fee_per_gas)}
-
   @uncle_reward_coef 32
   @spec block_reward_by_parts(Block.t(), [Transaction.t()]) :: %{
           block_number: block_number(),
@@ -346,7 +322,7 @@ defmodule Explorer.Chain.Block do
       miner_hash: block.miner_hash,
       static_reward: static_reward,
       transaction_fees: %Wei{value: transaction_fees},
-      burnt_fees: burnt_fees || %Wei{value: Decimal.new(0)},
+      burnt_fees: %Wei{value: burnt_fees},
       uncle_reward: uncle_reward
     }
   end