Merge pull request #108 from skalenetwork/develop

Beta release

Author: yavrsky

README.md

@@ -36,9 +36,33 @@ See the [project documentation](https://docs.blockscout.com/) for instructions:
 - [ENV variables](https://docs.blockscout.com/setup/env-variables)
 - [Configuration options](https://docs.blockscout.com/for-developers/configuration-options)
 
-## Acknowledgements
-
-We would like to thank the EthPrize foundation for their funding support.
+# FAIR Network Blockscout Configuration
+
+To deploy Blockscout for FAIR network, an `.env` file should be created based on this template.
+
+## Arguments
+### Required
+- **HOST** - hostname where the explorer will be accessible _(required)_
+- **CHAIN_ID** - chain ID for the FAIR network _(required)_
+- **ENDPOINT** - RPC endpoint for blockchain interaction _(required)_
+- **WS_ENDPOINT** - WebSocket endpoint for real-time data _(required)_
+- **SCHAIN_NAME** - name of the FAIR chain for flexibility purposes _(required)_
+- **COMPOSE_PROJECT_NAME** - Docker Compose project name (affects container naming) _(required)_
+- **SCHAIN_APP_NAME** - application name shown in the UI _(required)_
+- **PROXY_PORT** - HTTP/HTTPS proxy port for external access _(required)_
+- **DB_PORT** - database port for main app _(required)_
+- **STATS_PORT** - statistics service port _(required)_
+- **STATS_DB_PORT** - statistics database port _(required)_
+- **WALLET_CONNECT_PROJECT_ID** - WalletConnect project ID for wallet integration _(required)_
+### Optional
+- **IS_TESTNET** - whether this is a testnet deployment (true/false) _(optional)_
+- **BLOCKSCOUT_BACKEND_DOCKER_TAG** - version of blockscout backend container to use _(optional)_
+- **BLOCKSCOUT_FRONTEND_DOCKER_TAG** - version of blockscout frontend container to use _(optional)_
+- **STATIC_BLOCK_REWARD** - static block reward in wei for emission calculations _(optional)_
+- **BURNT_FEE_FRACTION** - fraction of gas fees that are burnt (0.0 to 1.0) _(optional)_
+### Required for production
+- **DB_PASSWORD** - password for PostgreSQL database _(required for production)_
+- **RE_CAPTCHA_SECRET_KEY** - private key used on blockscout server side to securely verify that user interactions are performed by humans _(required for production)_
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-2.3.0
+3.0.0

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

@@ -480,7 +480,30 @@ defmodule BlockScoutWeb.API.V2.TransactionView do
       if Decimal.compare(max_fee_per_gas.value, 0) == :eq do
         %Wei{value: Decimal.new(0)}
       else
-        Wei.mult(base_fee_per_gas, transaction.gas_used)
+        network = System.get_env("NETWORK")
+
+        if network == "FAIR" do
+          # FAIR network logic: use gas_price or max_fee_per_gas multiplied by fraction
+          fair_burnt_fee_fraction = Application.get_env(:explorer, :fair_burnt_fee_fraction, 0.5)
+
+          # Use gas_price if available, otherwise use max_fee_per_gas
+          effective_gas_price =
+            if transaction.gas_price do
+              transaction.gas_price
+            else
+              max_fee_per_gas
+            end
+
+          result = effective_gas_price
+          |> Wei.mult(transaction.gas_used)
+          |> Wei.mult(Decimal.from_float(fair_burnt_fee_fraction))
+
+          # Round to integer wei
+          %Wei{value: Decimal.round(result.value, 0)}
+        else
+          # Original EIP-1559 calculation for non-FAIR networks
+          Wei.mult(base_fee_per_gas, transaction.gas_used)
+        end
       end
     else
       nil

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex

@@ -7,18 +7,71 @@ defmodule EthereumJSONRPC.Geth do
 
   import EthereumJSONRPC, only: [id_to_params: 1, integer_to_quantity: 1, json_rpc: 2, request: 1]
 
-  alias EthereumJSONRPC.{FetchedBalance, FetchedCode, PendingTransaction, Utility.CommonHelper}
+  alias EthereumJSONRPC.{FetchedBalance, FetchedBeneficiaries, FetchedCode, PendingTransaction, Utility.CommonHelper}
   alias EthereumJSONRPC.Geth.{Calls, PolygonTracer, Tracer}
 
   @behaviour EthereumJSONRPC.Variant
 
   @doc """
-  Block reward contract beneficiary fetching is not supported currently for Geth.
-
-  To signal to the caller that fetching is not supported, `:ignore` is returned.
+  Block reward contract beneficiary fetching for FAIR.
   """
   @impl EthereumJSONRPC.Variant
-  def fetch_beneficiaries(_block_range, _json_rpc_named_arguments), do: :ignore
+  def fetch_beneficiaries(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
+    if is_fair_chain?(json_rpc_named_arguments) do
+      fetch_fair_beneficiaries(block_numbers, json_rpc_named_arguments)
+    else
+      :ignore
+    end
+  end
+
+  defp is_fair_chain?(_json_rpc_named_arguments) do
+    # Check if the NETWORK environment variable indicates FAIR network
+    network = System.get_env("NETWORK", "")
+    String.upcase(network) == "FAIR"
+  end
+
+  # Fetch beneficiaries for FAIR using block data
+  defp fetch_fair_beneficiaries(block_numbers, json_rpc_named_arguments) do
+    requests =
+      block_numbers
+      |> Enum.with_index()
+      |> Enum.map(fn {block_number, id} ->
+        EthereumJSONRPC.request(%{
+          id: id,
+          method: "eth_getBlockByNumber",
+          params: [EthereumJSONRPC.integer_to_quantity(block_number), false]
+        })
+      end)
+
+    case EthereumJSONRPC.json_rpc(requests, json_rpc_named_arguments) do
+      {:ok, responses} ->
+        params_set =
+          responses
+          |> Enum.map(fn %{id: id, result: block} when is_map(block) ->
+            block_number = Enum.at(block_numbers, id)
+            miner = Map.get(block, "miner") || Map.get(block, "author")
+
+            if miner do
+              %{
+                address_hash: miner,
+                address_type: :validator,
+                block_hash: Map.get(block, "hash"),
+                block_number: block_number,
+                reward: "0x0"
+              }
+            else
+              nil
+            end
+          end)
+          |> Enum.reject(&is_nil/1)
+          |> MapSet.new()
+
+        {:ok, %EthereumJSONRPC.FetchedBeneficiaries{params_set: params_set, errors: []}}
+
+      {:error, error} = error_result ->
+        error_result
+    end
+  end
 
   @doc """
   Fetches the `t:Explorer.Chain.InternalTransaction.changeset/2` params.

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

@@ -382,16 +382,47 @@ defmodule Explorer.Chain.Block do
   """
   @spec burnt_fees(list(), Decimal.t() | nil) :: Decimal.t()
   def burnt_fees(transactions, base_fee_per_gas) do
-    if is_nil(base_fee_per_gas) do
-      Decimal.new(0)
-    else
+    network = System.get_env("NETWORK")
+
+    if network == "FAIR" do
+      fair_burnt_fee_fraction = Application.get_env(:explorer, :fair_burnt_fee_fraction, 0.5)
+
       transactions
-      |> Enum.reduce(Decimal.new(0), fn %{gas_used: gas_used}, acc ->
-        gas_used
-        |> Decimal.new()
-        |> Decimal.add(acc)
+      |> Enum.reduce(Decimal.new(0), fn transaction, acc ->
+        gas_used = Decimal.new(transaction.gas_used)
+
+        # Use gas_price if available, otherwise use max_fee_per_gas
+        effective_gas_price =
+          if transaction.gas_price do
+            gas_price_to_decimal(transaction.gas_price)
+          else
+            gas_price_to_decimal(transaction.max_fee_per_gas)
+          end
+
+        if effective_gas_price do
+          transaction_burnt_fee = gas_used
+          |> Decimal.mult(effective_gas_price)
+          |> Decimal.mult(Decimal.from_float(fair_burnt_fee_fraction))
+          |> Decimal.round(0)
+
+          Decimal.add(transaction_burnt_fee, acc)
+        else
+          acc
+        end
       end)
-      |> Decimal.mult(gas_price_to_decimal(base_fee_per_gas))
+    else
+      # Original calculation for non-FAIR networks
+      if is_nil(base_fee_per_gas) do
+        Decimal.new(0)
+      else
+        transactions
+        |> Enum.reduce(Decimal.new(0), fn %{gas_used: gas_used}, acc ->
+          gas_used
+          |> Decimal.new()
+          |> Decimal.add(acc)
+        end)
+        |> Decimal.mult(gas_price_to_decimal(base_fee_per_gas))
+      end
     end
   end
 

apps/indexer/lib/indexer/supervisor.ex

@@ -289,7 +289,8 @@ defmodule Indexer.Supervisor do
   @variants_with_implemented_fetch_beneficiaries [
     EthereumJSONRPC.Besu,
     EthereumJSONRPC.Erigon,
-    EthereumJSONRPC.Nethermind
+    EthereumJSONRPC.Nethermind,
+    EthereumJSONRPC.Geth
   ]
 
   defp maybe_add_block_reward_fetcher(

config/runtime.exs

@@ -262,7 +262,8 @@ config :explorer,
   base_fee_max_change_denominator: ConfigHelper.parse_integer_env_var("EIP_1559_BASE_FEE_MAX_CHANGE_DENOMINATOR", 8),
   csv_export_limit: ConfigHelper.parse_integer_env_var("CSV_EXPORT_LIMIT", 10_000),
   shrink_internal_transactions_enabled: ConfigHelper.parse_bool_env_var("SHRINK_INTERNAL_TRANSACTIONS_ENABLED"),
-  replica_max_lag: ConfigHelper.parse_time_env_var("REPLICA_MAX_LAG", "5m")
+  replica_max_lag: ConfigHelper.parse_time_env_var("REPLICA_MAX_LAG", "5m"),
+  fair_burnt_fee_fraction: ConfigHelper.parse_float_env_var("BURNT_FEE_FRACTION", "0.5")
 
 config :explorer, :proxy,
   caching_implementation_data_enabled: true,

docker-compose/assets/fair/footer_links.json

@@ -0,0 +1,15 @@
+[
+    {
+        "title": "FAIR Community",
+        "links": [
+            {
+                "text": "GitHub",
+                "url": "https://github.com/skalenetwork"
+            },
+            {
+                "text": "Twitter",
+                "url": "https://x.com/FAIR_Blockchain"
+            }
+        ]
+    }
+]