Update reawrds fetching and withdrawal

Adjust the dapp to changes from #1567.

Author: r-czajkowski

solidity/dashboard/src/constants/constants.js

@@ -3,6 +3,7 @@ export const TOKEN_STAKING_CONTRACT_NAME = 'stakingContract'
 export const TOKEN_GRANT_CONTRACT_NAME = 'grantContract'
 export const OPERATOR_CONTRACT_NAME = 'keepRandomBeaconOperatorContract'
 export const REGISTRY_CONTRACT_NAME = 'registryContract'
+export const KEEP_OPERATOR_STATISTICS_CONTRACT_NAME = 'keepRandomBeaconOperatorStatistics'
 
 export const ETHERSCAN_DEFAULT_URL = 'https://ropsten.etherscan.io/address/'
 

solidity/dashboard/src/contracts.js

@@ -5,12 +5,14 @@ import KeepRandomBeaconOperator from '@keep-network/keep-core/artifacts/KeepRand
 import Registry from '@keep-network/keep-core/artifacts/Registry.json'
 import GuaranteedMinimumStakingPolicy from '@keep-network/keep-core/artifacts/GuaranteedMinimumStakingPolicy.json'
 import PermissiveStakingPolicy from '@keep-network/keep-core/artifacts/PermissiveStakingPolicy.json'
+import KeepRandomBeaconOperatorStatistics from '@keep-network/keep-core/artifacts/KeepRandomBeaconOperatorStatistics.json'
 import {
   KEEP_TOKEN_CONTRACT_NAME,
   TOKEN_STAKING_CONTRACT_NAME,
   TOKEN_GRANT_CONTRACT_NAME,
   OPERATOR_CONTRACT_NAME,
   REGISTRY_CONTRACT_NAME,
+  KEEP_OPERATOR_STATISTICS_CONTRACT_NAME,
 } from './constants/constants'
 
 export const CONTRACT_DEPLOY_BLOCK_NUMBER = {
@@ -19,6 +21,7 @@ export const CONTRACT_DEPLOY_BLOCK_NUMBER = {
   [OPERATOR_CONTRACT_NAME]: 0,
   [TOKEN_STAKING_CONTRACT_NAME]: 0,
   [REGISTRY_CONTRACT_NAME]: 0,
+  [KEEP_OPERATOR_STATISTICS_CONTRACT_NAME]: 0,
 }
 
 export async function getKeepToken(web3) {
@@ -41,6 +44,10 @@ export async function getRegistry(web3) {
   return getContract(web3, Registry, REGISTRY_CONTRACT_NAME)
 }
 
+export async function getKeepRandomBeaconOperatorStatistics(web3) {
+  return getContract(web3, KeepRandomBeaconOperatorStatistics, KEEP_OPERATOR_STATISTICS_CONTRACT_NAME)
+}
+
 export async function getKeepTokenContractDeployerAddress(web3) {
   const deployTransactionHash = getTransactionHashOfContractDeploy(KeepToken)
   const transaction = await web3.eth.getTransaction(deployTransactionHash)
@@ -62,6 +69,7 @@ export async function getContracts(web3) {
     getTokenStaking(web3),
     getKeepRandomBeaconOperator(web3),
     getRegistry(web3),
+    getKeepRandomBeaconOperatorStatistics(web3),
   ])
 
   return {
@@ -70,6 +78,7 @@ export async function getContracts(web3) {
     stakingContract: contracts[2],
     keepRandomBeaconOperatorContract: contracts[3],
     registryContract: contracts[4],
+    keepRandomBeaconOperatorStatistics: contracts[5]
   }
 }
 

solidity/dashboard/src/services/rewards.service.js

@@ -1,13 +1,18 @@
 import web3Utils from 'web3-utils'
 import { formatDate, wait, isSameEthAddress } from '../utils/general.utils'
-import { add, mul } from '../utils/arithmetics.utils'
+import { add, gt } from '../utils/arithmetics.utils'
 import { CONTRACT_DEPLOY_BLOCK_NUMBER } from '../contracts'
 import {
   OPERATOR_CONTRACT_NAME,
 } from '../constants/constants'
 
 const fetchAvailableRewards = async (web3Context) => {
-  const { keepRandomBeaconOperatorContract, stakingContract, yourAddress } = web3Context
+  const {
+    keepRandomBeaconOperatorContract,
+    keepRandomBeaconOperatorStatistics,
+    stakingContract,
+    yourAddress
+  } = web3Context
   try {
     let totalRewardsBalance = web3Utils.toBN(0)
     const expiredGroupsCount = await keepRandomBeaconOperatorContract.methods.getFirstActiveGroupIndex().call()
@@ -25,46 +30,44 @@ const fetchAvailableRewards = async (web3Context) => {
         if (!isSameEthAddress(yourAddress, beneficiaryAddressForMember)) {
           continue
         }
-        groupMemberIndices[groupPublicKey][memberAddress] = await keepRandomBeaconOperatorContract
+        const awaitingRewards = await keepRandomBeaconOperatorStatistics
           .methods
-          .getGroupMemberIndices(groupPublicKey, memberAddress)
+          .awaitingRewards(memberAddress, groupIndex)
           .call()
+                  
+        if (gt(awaitingRewards, 0)) {
+          groupMemberIndices[groupPublicKey][memberAddress] = awaitingRewards
+        }
       }
       if (Object.keys(groupMemberIndices[groupPublicKey]).length === 0) {
         continue
       }
-      const { reward, rewardPerMemberInWei } = await getAvailableRewardFromGroupInEther(groupPublicKey, groupMemberIndices, web3Context)
+      const reward = getAvailableRewardForGroup(groupMemberIndices[groupPublicKey])
       const isStale = await keepRandomBeaconOperatorContract.methods.isStaleGroup(groupPublicKey).call()
 
-      totalRewardsBalance = add(totalRewardsBalance, web3Utils.toWei(reward, 'ether'))
+      totalRewardsBalance = add(totalRewardsBalance, reward)
       groups.push({
         groupIndex: groupIndex.toString(),
         groupPublicKey,
         membersIndeces: groupMemberIndices[groupPublicKey],
-        reward,
-        rewardPerMemberInWei,
+        reward: web3Utils.fromWei(reward, 'ether'),
         isStale,
       })
     }
-    return [groups, web3Utils.fromWei(totalRewardsBalance.toString(), 'ether')]
+    return [groups, web3Utils.fromWei(totalRewardsBalance, 'ether')]
   } catch (error) {
     throw error
   }
 }
 
-const getAvailableRewardFromGroupInEther = async (groupPublicKey, groupMemberIndices, web3Context) => {
-  const { keepRandomBeaconOperatorContract } = web3Context
-  const membersInGroup = Object.keys(groupMemberIndices[groupPublicKey])
-  const rewardsMultiplier = membersInGroup.length === 1 ?
-    groupMemberIndices[groupPublicKey][membersInGroup[0]].length :
-    membersInGroup.reduce((prev, current, index) => {
-      const prevValue = index === 1 ? groupMemberIndices[groupPublicKey][prev].length : prev
-      return prevValue + groupMemberIndices[groupPublicKey][current].length
-    })
-  const groupMemberReward = await keepRandomBeaconOperatorContract.methods.getGroupMemberRewards(groupPublicKey).call()
-  const wholeReward = mul(groupMemberReward, rewardsMultiplier)
-
-  return { reward: web3Utils.fromWei(wholeReward, 'ether'), rewardPerMemberInWei: groupMemberReward }
+const getAvailableRewardForGroup = (oeratorsAmount) => {
+  let wholeReward = 0
+  for(const operator in oeratorsAmount ) {
+    if(oeratorsAmount.hasOwnProperty(operator) ) {
+      wholeReward = add(wholeReward, oeratorsAmount[operator])
+    }
+  }
+  return wholeReward
 }
 
 const withdrawRewardFromGroup = async (groupIndex, groupMembersIndices, web3Context) => {
@@ -78,7 +81,7 @@ const withdrawRewardFromGroup = async (groupIndex, groupMembersIndices, web3Cont
       return new Promise((resolve, reject) => {
         const request = keepRandomBeaconOperatorContract
           .methods
-          .withdrawGroupMemberRewards(memberAddress, groupIndex, groupMembersIndices[memberAddress])
+          .withdrawGroupMemberRewards(memberAddress, groupIndex)
           .send.request({ from: yourAddress }, (error, transactionHash) => {
             if (error) {
               resolve({ memberAddress, memberIndices: groupMembersIndices[memberAddress], isError: true, error })