From 52f03dd9dcd672d9b2e8f298bf8dcbfdbba2ffb0 Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Thu, 6 Mar 2025 14:27:23 +0400 Subject: [PATCH] add new api XDPoS_getRewardByAccount --- common/types.go | 4 ++ consensus/XDPoS/api.go | 133 ++++++++++++++++++++++++++++++++++++ internal/web3ext/web3ext.go | 6 ++ 3 files changed, 143 insertions(+) diff --git a/common/types.go b/common/types.go index aebda8e32e..2e2136d4a6 100644 --- a/common/types.go +++ b/common/types.go @@ -272,6 +272,10 @@ func (a Address) String() string { return a.Hex() } +func (a Address) String0x() string { + return string(a.checksumHex()) +} + func (a *Address) checksumHex() []byte { buf := a.hex() diff --git a/consensus/XDPoS/api.go b/consensus/XDPoS/api.go index 420f0d7d59..ab2a58b2ab 100644 --- a/consensus/XDPoS/api.go +++ b/consensus/XDPoS/api.go @@ -17,13 +17,18 @@ package XDPoS import ( "encoding/base64" + "encoding/json" "errors" "math/big" + "os" + "path/filepath" + "strings" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/consensus" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils" "github.com/XinFinOrg/XDPoSChain/core/types" + "github.com/XinFinOrg/XDPoSChain/log" "github.com/XinFinOrg/XDPoSChain/params" "github.com/XinFinOrg/XDPoSChain/rlp" "github.com/XinFinOrg/XDPoSChain/rpc" @@ -76,6 +81,22 @@ type MasternodesStatus struct { Error error } +type AccountEpochReward struct { + EpochBlockNum uint64 + Address common.Address + AccountStatus AccountRewardStatus + AccountReward *big.Int + DelegatedReward map[string]*big.Int +} + +type AccountRewardStatus string + +const ( + statusMasternode AccountRewardStatus = "MasterNode" + statusProtectornode AccountRewardStatus = "ProtectorNode" + statusObservernode AccountRewardStatus = "ObserverNode" +) + type MessageStatus map[string]map[string]SignerTypes // GetSnapshot retrieves the state snapshot at a given block. @@ -315,6 +336,118 @@ func calculateSigners(message map[string]SignerTypes, pool map[string]map[common } } +func (api *API) GetRewardByAccount(account common.Address, begin rpc.BlockNumber, end rpc.BlockNumber) ([]AccountEpochReward, error) { + epochBlocks, err := api.GetEpochNumbersBetween(&begin, &end) + if err != nil { + return []AccountEpochReward{}, err + } + epochRewards := []AccountEpochReward{} + for _, epochBlock := range epochBlocks { + header := api.chain.GetHeaderByNumber(epochBlock) + if header == nil { + log.Error("[GetRewardByAccount] header not found, impossible case, please check or report to XDC", "err", err) + return []AccountEpochReward{}, err + } + epochReward, err := getEpochReward(account, header) + if err != nil { + return []AccountEpochReward{}, err + } + epochRewards = append(epochRewards, epochReward) + } + + return epochRewards, nil +} + +func getEpochReward(account common.Address, header *types.Header) (AccountEpochReward, error) { + var data map[string]interface{} + path := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.Hash().Hex()) + alternatePath := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.HashNoValidator().Hex()) + file, err := os.Open(path) + if err != nil { + file, err := os.Open(alternatePath) + if err != nil { + log.Warn("[getEpochReward] rewards file not found", "path", path, "alternatePath", alternatePath) + return AccountEpochReward{}, err + } + defer file.Close() + decoder := json.NewDecoder(file) + decoder.UseNumber() + if err := decoder.Decode(&data); err != nil { + log.Warn("[getEpochReward] Failed to decode JSON:", "err", err) + return AccountEpochReward{}, err + } + } else { + defer file.Close() + decoder := json.NewDecoder(file) + decoder.UseNumber() + if err := decoder.Decode(&data); err != nil { + log.Warn("[getEpochReward] Failed to decode JSON:", "err", err) + return AccountEpochReward{}, err + } + } + + epochReward := AccountEpochReward{ + Address: account, + EpochBlockNum: header.Number.Uint64(), + DelegatedReward: make(map[string]*big.Int), + } + epochReward.getRewardAndStatus(strings.ToLower(account.String0x()), data) + + return epochReward, nil +} + +func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map[string]interface{}) { + if val, exists := data["signers"]; exists { + if val, exists := val.(map[string]interface{})[account]; exists { + nodeReward := val.(map[string]interface{})["reward"] + delegatedReward := data["rewards"].(map[string]interface{})[account] + rewardObj.AccountStatus = statusMasternode + nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + rewardObj.AccountReward = nodeRewardBigInt + + for k, v := range delegatedReward.(map[string]interface{}) { + delegatedBigInt, _ := new(big.Int).SetString(v.(json.Number).String(), 10) + rewardObj.DelegatedReward[k] = delegatedBigInt + } + return + } + } + + if val, exists := data["signersProtector"]; exists { + if val, exists := val.(map[string]interface{})[account]; exists { + nodeReward := val.(map[string]interface{})["reward"] + delegatedReward := data["rewardsProtector"].(map[string]interface{})[account] + rewardObj.AccountStatus = statusProtectornode + nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + rewardObj.AccountReward = nodeRewardBigInt + + for k, v := range delegatedReward.(map[string]interface{}) { + delegatedBigInt, _ := new(big.Int).SetString(v.(json.Number).String(), 10) + rewardObj.DelegatedReward[k] = delegatedBigInt + } + return + } + + } + + if val, exists := data["signersObserver"]; exists { + if val, exists := val.(map[string]interface{})[account]; exists { + nodeReward := val.(map[string]interface{})["reward"] + delegatedReward := data["rewardsObserver"].(map[string]interface{})[account] + rewardObj.AccountStatus = statusObservernode + nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + rewardObj.AccountReward = nodeRewardBigInt + + for k, v := range delegatedReward.(map[string]interface{}) { + delegatedBigInt, _ := new(big.Int).SetString(v.(json.Number).String(), 10) + rewardObj.DelegatedReward[k] = delegatedBigInt + } + return + } + } + +} + func (api *API) GetEpochNumbersBetween(begin, end *rpc.BlockNumber) ([]uint64, error) { beginHeader := api.getHeaderFromApiBlockNum(begin) if beginHeader == nil { diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go index 68ec05444a..1b203016f1 100644 --- a/internal/web3ext/web3ext.go +++ b/internal/web3ext/web3ext.go @@ -173,6 +173,12 @@ web3._extend({ call: 'XDPoS_getBlockInfoByEpochNum', params: 1, }), + new web3._extend.Method({ + name: 'getRewardByAccount', + call: 'XDPoS_getRewardByAccount', + params: 3, + inputFormatter: [null, web3._extend.formatters.inputBlockNumberFormatter, web3._extend.formatters.inputBlockNumberFormatter] + }), ], properties: [ new web3._extend.Property({