Claim reward updates

apps/block_scout_web/assets/css/components/_stakes_table.scss

@@ -118,6 +118,7 @@ $stakes-link-color: $primary !default;
 .stakes-th-text {
   margin-right: 10px;
   white-space: nowrap;
+  text-align: center;
 }
 
 .stakes-td {

apps/block_scout_web/assets/js/pages/stakes/become_candidate.js

@@ -39,18 +39,13 @@ async function becomeCandidate ($modal, store, msg) {
   lockModal($modal)
 
   const stakingContract = store.getState().stakingContract
-  const blockRewardContract = store.getState().blockRewardContract
   const decimals = store.getState().tokenDecimals
   const stake = new BigNumber($modal.find('[candidate-stake]').val().replace(',', '.').trim()).shiftedBy(decimals).integerValue()
   const miningAddress = $modal.find('[mining-address]').val().trim().toLowerCase()
 
   try {
     if (!await stakingContract.methods.areStakeAndWithdrawAllowed().call()) {
-      if (await blockRewardContract.methods.isSnapshotting().call()) {
-        openErrorModal('Error', 'Staking actions are temporarily restricted. Please try again in a few blocks.')
-      } else {
-        openErrorModal('Error', 'The current staking epoch is ending, and staking actions are temporarily restricted. Please try again when the new epoch starts.')
-      }
+      openErrorModal('Error', 'The current staking epoch is ending, and staking actions are temporarily restricted. Please try again when the new epoch starts.')
       return false
     }
 

apps/block_scout_web/assets/js/pages/stakes/claim_withdrawal.js

@@ -11,7 +11,7 @@ export function openClaimWithdrawalModal (event, store) {
     .push('render_claim_withdrawal', { address })
     .receive('ok', msg => {
       const $modal = $(msg.html)
-      setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.staked_amount)
+      setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.total_staked_amount)
       $modal.find('form').submit(() => {
         claimWithdraw($modal, address, store)
         return false

apps/block_scout_web/assets/js/pages/stakes/make_stake.js

@@ -18,7 +18,7 @@ export function openMakeStakeModal (event, store) {
     .push('render_make_stake', { address })
     .receive('ok', msg => {
       const $modal = $(msg.html)
-      setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.staked_amount)
+      setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.total_staked_amount)
       setupValidation(
         $modal.find('form'),
         {

apps/block_scout_web/assets/js/pages/stakes/move_stake.js

@@ -19,9 +19,9 @@ export function openMoveStakeModal (event, store) {
 }
 
 function setupModal ($modal, fromAddress, store, msg) {
-  setupChart($modal.find('.js-pool-from-progress'), msg.from.self_staked_amount, msg.from.staked_amount)
+  setupChart($modal.find('.js-pool-from-progress'), msg.from.self_staked_amount, msg.from.total_staked_amount)
   if (msg.to) {
-    setupChart($modal.find('.js-pool-to-progress'), msg.to.self_staked_amount, msg.to.staked_amount)
+    setupChart($modal.find('.js-pool-to-progress'), msg.to.self_staked_amount, msg.to.total_staked_amount)
 
     setupValidation(
       $modal.find('form'),

apps/block_scout_web/assets/js/pages/stakes/withdraw_stake.js

@@ -16,7 +16,7 @@ export function openWithdrawStakeModal (event, store) {
 
 function setupWithdrawStakeModal (address, store, msg) {
   const $modal = $(msg.html)
-  setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.staked_amount)
+  setupChart($modal.find('.js-stakes-progress'), msg.self_staked_amount, msg.total_staked_amount)
   setupValidation(
     $modal.find('form'),
     {

apps/block_scout_web/lib/block_scout_web/chain.ex

@@ -253,7 +253,7 @@ defmodule BlockScoutWeb.Chain do
     %{"block_number" => block_number}
   end
 
-  defp paging_params(%StakingPool{staking_address_hash: address_hash, staked_ratio: value}) do
+  defp paging_params(%StakingPool{staking_address_hash: address_hash, stakes_ratio: value}) do
     %{"address_hash" => address_hash, "value" => Decimal.to_string(value)}
   end
 

apps/block_scout_web/lib/block_scout_web/channels/stakes_channel.ex

@@ -41,7 +41,7 @@ defmodule BlockScoutWeb.StakesChannel do
     token = ContractState.get(:token)
 
     html =
-      View.render_to_string(StakesView, "_stakes_modal_validator_info.html",
+      View.render_to_string(StakesView, "_stakes_modal_pool_info.html",
         validator: pool,
         delegator: delegator,
         average_block_time: average_block_time,
@@ -55,6 +55,9 @@ defmodule BlockScoutWeb.StakesChannel do
     pool = Chain.staking_pool(staking_address)
     token = ContractState.get(:token)
 
+    is_show_snapshotted_data =
+      pool.is_validator && ContractState.get(:validator_set_apply_block) > 0 && ContractState.get(:is_snapshotted)
+
     delegators =
       staking_address
       |> Chain.staking_pool_delegators()
@@ -73,7 +76,8 @@ defmodule BlockScoutWeb.StakesChannel do
         account: socket.assigns[:account],
         pool: pool,
         delegators: delegators,
-        token: token
+        token: token,
+        is_show_snapshotted_data: is_show_snapshotted_data
       )
 
     {:reply, {:ok, %{html: html}}, socket}
@@ -128,7 +132,7 @@ defmodule BlockScoutWeb.StakesChannel do
       delegator_staked: (delegator && delegator.stake_amount) || 0,
       min_stake: min_stake,
       self_staked_amount: pool.self_staked_amount,
-      staked_amount: pool.staked_amount
+      total_staked_amount: pool.total_staked_amount
     }
 
     {:reply, {:ok, result}, socket}
@@ -174,15 +178,15 @@ defmodule BlockScoutWeb.StakesChannel do
         stake_amount: delegator_from.stake_amount,
         min_stake: min_from_stake,
         self_staked_amount: pool_from.self_staked_amount,
-        staked_amount: pool_from.staked_amount
+        total_staked_amount: pool_from.total_staked_amount
       },
       to:
         if pool_to do
           %{
             stake_amount: (delegator_to && delegator_to.stake_amount) || 0,
             min_stake: min_to_stake,
             self_staked_amount: pool_to.self_staked_amount,
-            staked_amount: pool_to.staked_amount
+            total_staked_amount: pool_to.total_staked_amount
           }
         end
     }
@@ -212,7 +216,7 @@ defmodule BlockScoutWeb.StakesChannel do
     result = %{
       html: html,
       self_staked_amount: pool.self_staked_amount,
-      staked_amount: pool.staked_amount,
+      total_staked_amount: pool.total_staked_amount,
       delegator_staked: delegator.stake_amount,
       ordered_withdraw: delegator.ordered_withdraw,
       max_withdraw_allowed: delegator.max_withdraw_allowed,
@@ -238,7 +242,7 @@ defmodule BlockScoutWeb.StakesChannel do
     result = %{
       html: html,
       self_staked_amount: pool.self_staked_amount,
-      staked_amount: pool.staked_amount
+      total_staked_amount: pool.total_staked_amount
     }
 
     {:reply, {:ok, result}, socket}

apps/block_scout_web/lib/block_scout_web/templates/stakes/_rows.html.eex

@@ -15,15 +15,15 @@
     render BlockScoutWeb.CommonComponentsView,
     "_progress_from_to.html",
     from: format_token_amount(@pool.self_staked_amount, @token, digits: 0, ellipsize: false, symbol: false),
-    to: format_token_amount(@pool.staked_amount, @token, digits: 0, ellipsize: false, symbol: false),
+    to: format_token_amount(@pool.total_staked_amount, @token, digits: 0, ellipsize: false, symbol: false),
     progress: amount_ratio(@pool)
     %>
   </div>
   <div class="col-2 stakes-td stakes-cell">
     <%= if @pools_type == :inactive do %>
       <%= if @pool.is_banned, do: gettext("Yes"), else: gettext("No") %>
     <% else %>
-      <%= if @pool.staked_ratio, do: "#{@pool.staked_ratio}%" %>
+      <%= if @pool.stakes_ratio, do: "#{@pool.stakes_ratio}%" %>
     <% end %>
   </div>
   <div class="col-2 stakes-td stakes-cell">

apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_modal_delegators_list.html.eex

@@ -13,14 +13,29 @@
               <%= render BlockScoutWeb.StakesView, "_stakes_th.html", title: gettext("Staker's Address"), tooltip: gettext("All pool participant addresses. The top address belongs to the validator.") %>
             </div>
             <div class="col-4">
-              <%= render BlockScoutWeb.StakesView, "_stakes_th.html", title: gettext("Total Stake Amount"), tooltip: gettext("Amount of STAKE placed by an address") %>
+              <%=
+                amount_col_title =
+                  if @is_show_snapshotted_data do
+                    gettext("Current Stake Amount") <> "<br />(" <> gettext("Accounted Stake Amount")  <> ")"
+                  else
+                    gettext("Current Stake Amount")
+                  end
+
+                render BlockScoutWeb.StakesView, "_stakes_th.html", title: amount_col_title, tooltip: gettext("Amount of STAKE placed by an address")
+              %>
             </div>
             <div class="col-3">
               <%=
-                title = if @pool.is_validator do gettext("Reward Percent") else gettext("Potential Reward Percent") end
+                reward_col_title =
+                  if @is_show_snapshotted_data do
+                    gettext("Potential Reward Percent") <> "<br />(" <> gettext("Current Reward Percent")  <> ")"
+                  else
+                    gettext("Potential Reward Percent")
+                  end
+
                 render BlockScoutWeb.StakesView,
                   "_stakes_th.html",
-                  title: title,
+                  title: reward_col_title,
                   tooltip: gettext("Reward distribution is based on stake amount. Validator receives a minimum of 30%.")
               %>
             </div>
@@ -52,8 +67,52 @@
                     <% end %>
                   </div>
                 </div>
-                <div class="col-4 stakes-td stakes-cell"><%= format_token_amount(delegator.stake_amount, @token, symbol: false) %></div>
-                <div class="col-3 stakes-td stakes-cell"><%= if delegator.reward_ratio do "#{delegator.reward_ratio}%" else "-" end %></div>
+                <div class="col-4 stakes-td stakes-cell">
+                  <%= format_token_amount(delegator.stake_amount, @token, symbol: false) %>
+                  <%= if @is_show_snapshotted_data do %>
+                    (
+                      <%=
+                        if delegator.snapshotted_stake_amount do
+                          format_token_amount(delegator.snapshotted_stake_amount, @token, symbol: false)
+                        else
+                          0
+                        end
+                      %>
+                    )
+                  <% end %>
+                </div>
+                <div class="col-3 stakes-td stakes-cell">
+                  <%
+                    reward =
+                      if delegator.delegator_address_hash == @pool.staking_address_hash do
+                        %{
+                          reward_ratio: @pool.validator_reward_ratio,
+                          snapshotted_reward_ratio: @pool.snapshotted_validator_reward_ratio
+                        }
+                      else
+                        %{
+                          reward_ratio: delegator.reward_ratio,
+                          snapshotted_reward_ratio: delegator.snapshotted_reward_ratio
+                        }
+                      end
+                  %>
+                  <%= if reward.reward_ratio do %>
+                    <%= reward.reward_ratio %>%
+                    <%= if @is_show_snapshotted_data do %>
+                      (
+                        <%=
+                          if reward.snapshotted_reward_ratio do
+                            "#{reward.snapshotted_reward_ratio}%"
+                          else
+                            "0%"
+                          end
+                        %>
+                      )
+                    <% end %>
+                  <% else %>
+                    -
+                  <% end %>
+                </div>
               </div>
             <% end %>
           </div>

apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_modal_validator_info.html.eex → apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_modal_pool_info.html.eex

@@ -35,18 +35,18 @@
           render BlockScoutWeb.StakesView,
           "_stakes_validator_info_item.html",
           title: gettext("Delegators’ Staked Amount"),
-          value: format_token_amount(Decimal.sub(@validator.staked_amount, @validator.self_staked_amount), @token)
+          value: format_token_amount(Decimal.sub(@validator.total_staked_amount, @validator.self_staked_amount), @token)
         %>
         <%=
           render BlockScoutWeb.StakesView,
           "_stakes_validator_info_item.html",
           title: gettext("Stakes Ratio"),
-          value: if(@validator.staked_ratio, do: "#{@validator.staked_ratio}%")
+          value: if(@validator.stakes_ratio, do: "#{@validator.stakes_ratio}%")
         %>
         <%=
           render BlockScoutWeb.StakesView,
           "_stakes_validator_info_item.html",
-          title: gettext("Reward Percent"),
+          title: gettext("Share of Pool’s Reward"),
           value: "#{@validator.block_reward_ratio}%"
         %>
         <%=

apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_progress.html.eex

@@ -10,7 +10,7 @@
         <%= format_token_amount(@pool.self_staked_amount, @token, symbol: false, digits: 2) %>
       </div>
       <div class="stakes-progress-data-total js-stakes-progress-data-total">
-        <%= format_token_amount(@pool.staked_amount, @token, symbol: false, digits: 2) %>
+        <%= format_token_amount(@pool.total_staked_amount, @token, symbol: false, digits: 2) %>
       </div>
     </div>
   </div>
@@ -24,7 +24,7 @@
     <div class="stakes-progress-info">
       <h2 class="stakes-progress-info-title"><%= gettext("Stakes Ratio") %></h2>
       <p class="stakes-progress-info-value">
-        <%= @pool.staked_ratio %>%
+        <%= @pool.stakes_ratio %>%
       </p>
     </div>
     <div class="stakes-progress-info">

apps/block_scout_web/lib/block_scout_web/templates/stakes/_stakes_th.html.eex

@@ -1,6 +1,6 @@
 <th class="stakes-table-th">
     <div class="stakes-table-th-content">
-        <span class="stakes-th-text"><%= @title %></span>
+        <span class="stakes-th-text"><%= raw(@title) %></span>
         <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip.html", text: @tooltip %>
     </div>
 </th>

apps/block_scout_web/lib/block_scout_web/views/stakes_helpers.ex

@@ -12,11 +12,11 @@ defmodule BlockScoutWeb.StakesHelpers do
     zero = Decimal.new(0)
 
     case pool do
-      %{staked_amount: ^zero} ->
+      %{total_staked_amount: ^zero} ->
         0
 
-      %{staked_amount: staked_amount, self_staked_amount: self_staked} ->
-        amount = Decimal.to_float(staked_amount)
+      %{total_staked_amount: total_staked_amount, self_staked_amount: self_staked} ->
+        amount = Decimal.to_float(total_staked_amount)
         self = Decimal.to_float(self_staked)
         self / amount * 100
     end