Merge branch 'master' into ab-pagination

CHANGELOG.md

@@ -22,6 +22,7 @@
 - [#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
 - [#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
 - [#1933](https://github.com/poanetwork/blockscout/pull/1933) - add eth_BlockNumber json rpc method
 - [#1952](https://github.com/poanetwork/blockscout/pull/1952) - feat: exclude empty contracts by default

apps/explorer/lib/explorer/chain/import/runner/staking_pools.ex

@@ -91,7 +91,7 @@ defmodule Explorer.Chain.Import.Runner.StakingPools do
     {:ok, _} =
       Import.insert_changes_list(
         repo,
-        changes_list,
+        stakes_ratio(changes_list),
         conflict_target: {:unsafe_fragment, "(address_hash) where \"primary\" = true"},
         on_conflict: on_conflict,
         for: Address.Name,
@@ -114,4 +114,20 @@ defmodule Explorer.Chain.Import.Runner.StakingPools do
       ]
     )
   end
+
+  # Calculates staked ratio for each pool
+  defp stakes_ratio(pools) do
+    active_pools = Enum.filter(pools, & &1.metadata[:is_active])
+
+    stakes_total =
+      Enum.reduce(pools, 0, fn pool, acc ->
+        acc + pool.metadata[:staked_amount]
+      end)
+
+    Enum.map(active_pools, fn pool ->
+      staked_ratio = if stakes_total > 0, do: pool.metadata[:staked_amount] / stakes_total, else: 0
+
+      put_in(pool, [:metadata, :staked_ratio], staked_ratio)
+    end)
+  end
 end

apps/explorer/test/explorer/chain/import/runner/staking_pools_test.exs

@@ -1,85 +1,29 @@
 defmodule Explorer.Chain.Import.Runner.StakingPoolsTest do
   use Explorer.DataCase
 
+  import Explorer.Factory
+
   alias Ecto.Multi
   alias Explorer.Chain.Import.Runner.StakingPools
 
   describe "run/1" do
     test "insert new pools list" do
-      pools = [
-        %{
-          address_hash: %Explorer.Chain.Hash{
-            byte_count: 20,
-            bytes: <<11, 47, 94, 47, 60, 189, 134, 78, 170, 44, 100, 46, 55, 105, 193, 88, 35, 97, 202, 246>>
-          },
-          metadata: %{
-            banned_unitil: 0,
-            delegators_count: 0,
-            is_active: true,
-            is_banned: false,
-            is_validator: true,
-            mining_address: %Explorer.Chain.Hash{
-              byte_count: 20,
-              bytes: <<187, 202, 168, 212, 130, 137, 187, 31, 252, 249, 128, 141, 154, 164, 177, 210, 21, 5, 76, 120>>
-            },
-            retries_count: 1,
-            staked_amount: 0,
-            was_banned_count: 0,
-            was_validator_count: 1
-          },
-          name: "anonymous",
-          primary: true
-        },
-        %{
-          address_hash: %Explorer.Chain.Hash{
-            byte_count: 20,
-            bytes: <<170, 148, 182, 135, 211, 249, 85, 42, 69, 59, 129, 178, 131, 76, 165, 55, 120, 152, 13, 192>>
-          },
-          metadata: %{
-            banned_unitil: 0,
-            delegators_count: 0,
-            is_active: true,
-            is_banned: false,
-            is_validator: true,
-            mining_address: %Explorer.Chain.Hash{
-              byte_count: 20,
-              bytes: <<117, 223, 66, 56, 58, 254, 107, 245, 25, 74, 168, 250, 14, 155, 61, 95, 158, 134, 148, 65>>
-            },
-            retries_count: 1,
-            staked_amount: 0,
-            was_banned_count: 0,
-            was_validator_count: 1
-          },
-          name: "anonymous",
-          primary: true
-        },
-        %{
-          address_hash: %Explorer.Chain.Hash{
-            byte_count: 20,
-            bytes: <<49, 44, 35, 14, 125, 109, 176, 82, 36, 246, 2, 8, 166, 86, 227, 84, 28, 92, 66, 186>>
-          },
-          metadata: %{
-            banned_unitil: 0,
-            delegators_count: 0,
-            is_active: true,
-            is_banned: false,
-            is_validator: true,
-            mining_address: %Explorer.Chain.Hash{
-              byte_count: 20,
-              bytes: <<82, 45, 243, 150, 174, 112, 160, 88, 189, 105, 119, 132, 8, 99, 15, 219, 2, 51, 137, 178>>
-            },
-            retries_count: 1,
-            staked_amount: 0,
-            was_banned_count: 0,
-            was_validator_count: 1
-          },
-          name: "anonymous",
-          primary: true
-        }
-      ]
+      pools = [pool1, pool2, pool3, pool4] = build_list(4, :staking_pool)
 
       assert {:ok, %{insert_staking_pools: list}} = run_changes(pools)
       assert Enum.count(list) == Enum.count(pools)
+
+      saved_list =
+        Explorer.Chain.Address.Name
+        |> Repo.all()
+        |> Enum.reduce(%{}, fn pool, acc ->
+          Map.put(acc, pool.address_hash, pool)
+        end)
+
+      assert saved_list[pool1.address_hash].metadata["staked_ratio"] == 0.25
+      assert saved_list[pool2.address_hash].metadata["staked_ratio"] == 0.25
+      assert saved_list[pool3.address_hash].metadata["staked_ratio"] == 0.25
+      assert saved_list[pool4.address_hash].metadata["staked_ratio"] == 0.25
     end
   end
 

apps/explorer/test/support/factory.ex

@@ -609,4 +609,24 @@ defmodule Explorer.Factory do
       user: build(:user)
     }
   end
+
+  def staking_pool_factory do
+    %{
+      address_hash: address_hash(),
+      metadata: %{
+        banned_unitil: 0,
+        delegators_count: 0,
+        is_active: true,
+        is_banned: false,
+        is_validator: true,
+        mining_address: address_hash(),
+        retries_count: 1,
+        staked_amount: 25,
+        was_banned_count: 0,
+        was_validator_count: 1
+      },
+      name: "anonymous",
+      primary: true
+    }
+  end
 end