From 52f03dd9dcd672d9b2e8f298bf8dcbfdbba2ffb0 Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Thu, 6 Mar 2025 14:27:23 +0400 Subject: [PATCH 1/5] 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({ From 65e3a5534a74ceb6b333977ce54c444536a471f1 Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Sun, 30 Mar 2025 23:30:45 +0400 Subject: [PATCH 2/5] change approach to epochnumber search add total rewards in response --- consensus/XDPoS/api.go | 99 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/consensus/XDPoS/api.go b/consensus/XDPoS/api.go index ab2a58b2ab..80e435ac34 100644 --- a/consensus/XDPoS/api.go +++ b/consensus/XDPoS/api.go @@ -22,6 +22,8 @@ import ( "math/big" "os" "path/filepath" + "sort" + "strconv" "strings" "github.com/XinFinOrg/XDPoSChain/common" @@ -89,6 +91,18 @@ type AccountEpochReward struct { DelegatedReward map[string]*big.Int } +type TotalRewards struct { + Address common.Address + StartBlockNum uint64 + EndBlockNum uint64 + TotalAccountReward *big.Int + TotalDelegatedReward map[string]*big.Int +} +type AccountRewardResponse struct { + EpochRewards []AccountEpochReward + Total TotalRewards +} + type AccountRewardStatus string const ( @@ -336,26 +350,97 @@ 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) +func (api *API) GetRewardByAccount(account common.Address, begin rpc.BlockNumber, end rpc.BlockNumber) (AccountRewardResponse, error) { + epochBlocks, err := api.getEpochNumbersFromRewardFiles(&begin, &end) if err != nil { - return []AccountEpochReward{}, err + return AccountRewardResponse{}, 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 + log.Error("[GetRewardByAccount] header not found, impossible case, please check your RPC", "err", err) + return AccountRewardResponse{}, err } epochReward, err := getEpochReward(account, header) if err != nil { - return []AccountEpochReward{}, err + return AccountRewardResponse{}, err } epochRewards = append(epochRewards, epochReward) } - return epochRewards, nil + total := TotalRewards{ + Address: account, + StartBlockNum: uint64(begin.Int64()), + EndBlockNum: uint64(end.Int64()), + TotalAccountReward: big.NewInt(0), + TotalDelegatedReward: make(map[string]*big.Int), + } + + for _, reward := range epochRewards { + total.TotalAccountReward = new(big.Int).Add(total.TotalAccountReward, reward.AccountReward) + for k, v := range reward.DelegatedReward { + _, exist := total.TotalDelegatedReward[k] + if exist { + total.TotalDelegatedReward[k] = new(big.Int).Add(total.TotalDelegatedReward[k], v) + } else { + total.TotalDelegatedReward[k] = v + } + } + } + + response := AccountRewardResponse{ + EpochRewards: epochRewards, + Total: total, + } + return response, nil +} + +func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]uint64, error) { + beginHeader := api.getHeaderFromApiBlockNum(begin) + if beginHeader == nil { + return nil, errors.New("illegal begin block number") + } + endHeader := api.getHeaderFromApiBlockNum(end) + if endHeader == nil { + return nil, errors.New("illegal end block number") + } + if beginHeader.Number.Cmp(endHeader.Number) > 0 { + return nil, errors.New("illegal begin and end block number, begin > end") + } + if big.NewInt(1_500_000).Cmp(new(big.Int).Sub(endHeader.Number, beginHeader.Number)) < 0 { + return nil, errors.New("block range over limit of 1,500,000 blocks") + } + files, err := os.ReadDir(common.StoreRewardFolder) + if err != nil { + return nil, err + } + + var epochNumbers []int + for _, file := range files { + if !file.IsDir() { + filePrefix, _, found := strings.Cut(file.Name(), ".") + if found { + filePrefixInt, err := strconv.Atoi(filePrefix) + if err != nil { + log.Warn("[getEpochNumbersFromRewardFiles] found unknown filename format in rewards folder") + return nil, err + } + epochNumbers = append(epochNumbers, filePrefixInt) + } + } + } + sort.Ints(epochNumbers) + startIndex := sort.SearchInts(epochNumbers, int(beginHeader.Number.Int64())) + endIndex := sort.SearchInts(epochNumbers, int(endHeader.Number.Int64())) + + var epochNumbersInRange []uint64 + for i := startIndex; i <= endIndex; i++ { + number := uint64(epochNumbers[i]) + epochNumbersInRange = append(epochNumbersInRange, number) + } + + return epochNumbersInRange, nil } func getEpochReward(account common.Address, header *types.Header) (AccountEpochReward, error) { From 4fc208b527ac5b472a6f299fc2770557119a1f8f Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Tue, 1 Apr 2025 09:03:15 +0400 Subject: [PATCH 3/5] rename variables and optimize code --- consensus/XDPoS/api.go | 53 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/consensus/XDPoS/api.go b/consensus/XDPoS/api.go index 80e435ac34..6c31001f15 100644 --- a/consensus/XDPoS/api.go +++ b/consensus/XDPoS/api.go @@ -408,7 +408,11 @@ func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]u if beginHeader.Number.Cmp(endHeader.Number) > 0 { return nil, errors.New("illegal begin and end block number, begin > end") } - if big.NewInt(1_500_000).Cmp(new(big.Int).Sub(endHeader.Number, beginHeader.Number)) < 0 { + diff := new(big.Int).Sub(endHeader.Number, beginHeader.Number).Int64() + if diff < 0 { + return nil, errors.New("illegal begin and end block number, begin > end") + } + if diff > 1_500_000 { return nil, errors.New("block range over limit of 1,500,000 blocks") } files, err := os.ReadDir(common.StoreRewardFolder) @@ -444,33 +448,26 @@ func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]u } 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) + alternatePath := filepath.Join(common.StoreRewardFolder, header.Number.String()+"."+header.HashNoValidator().Hex()) + 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 - } } + defer file.Close() + decoder := json.NewDecoder(file) + decoder.UseNumber() + var data map[string]interface{} + 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(), @@ -482,9 +479,9 @@ func getEpochReward(account common.Address, header *types.Header) (AccountEpochR } 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"] + if signersData, exists := data["signers"]; exists { + if accountData, ok := signersData.(map[string]interface{})[account]; ok { + nodeReward := accountData.(map[string]interface{})["reward"] delegatedReward := data["rewards"].(map[string]interface{})[account] rewardObj.AccountStatus = statusMasternode nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) @@ -498,9 +495,9 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map } } - if val, exists := data["signersProtector"]; exists { - if val, exists := val.(map[string]interface{})[account]; exists { - nodeReward := val.(map[string]interface{})["reward"] + if signersData, exists := data["signersProtector"]; exists { + if accountData, ok := signersData.(map[string]interface{})[account]; ok { + nodeReward := accountData.(map[string]interface{})["reward"] delegatedReward := data["rewardsProtector"].(map[string]interface{})[account] rewardObj.AccountStatus = statusProtectornode nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) @@ -515,9 +512,9 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map } - if val, exists := data["signersObserver"]; exists { - if val, exists := val.(map[string]interface{})[account]; exists { - nodeReward := val.(map[string]interface{})["reward"] + if signersData, exists := data["signersObserver"]; exists { + if accountData, ok := signersData.(map[string]interface{})[account]; ok { + nodeReward := accountData.(map[string]interface{})["reward"] delegatedReward := data["rewardsObserver"].(map[string]interface{})[account] rewardObj.AccountStatus = statusObservernode nodeRewardBigInt, _ := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) From 8ca51b6ee484cbf210f77505043ba00f34df47c9 Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Thu, 17 Apr 2025 15:39:07 +0400 Subject: [PATCH 4/5] - compare both hash and block num from reward filename to blockchain state - complete error handling --- consensus/XDPoS/api.go | 93 +++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 29 deletions(-) diff --git a/consensus/XDPoS/api.go b/consensus/XDPoS/api.go index 6c31001f15..3bc16d57b3 100644 --- a/consensus/XDPoS/api.go +++ b/consensus/XDPoS/api.go @@ -98,6 +98,7 @@ type TotalRewards struct { TotalAccountReward *big.Int TotalDelegatedReward map[string]*big.Int } + type AccountRewardResponse struct { EpochRewards []AccountEpochReward Total TotalRewards @@ -105,6 +106,11 @@ type AccountRewardResponse struct { type AccountRewardStatus string +type rewardFileName struct { + epochBlockNum int + epochBlockHash common.Hash +} + const ( statusMasternode AccountRewardStatus = "MasterNode" statusProtectornode AccountRewardStatus = "ProtectorNode" @@ -351,16 +357,21 @@ func calculateSigners(message map[string]SignerTypes, pool map[string]map[common } func (api *API) GetRewardByAccount(account common.Address, begin rpc.BlockNumber, end rpc.BlockNumber) (AccountRewardResponse, error) { - epochBlocks, err := api.getEpochNumbersFromRewardFiles(&begin, &end) + rewardFileNames, err := api.getRewardFileNamesInRange(&begin, &end) if err != nil { return AccountRewardResponse{}, err } + epochRewards := []AccountEpochReward{} - for _, epochBlock := range epochBlocks { - header := api.chain.GetHeaderByNumber(epochBlock) + for _, fileName := range rewardFileNames { + header := api.chain.GetHeaderByHash(fileName.epochBlockHash) if header == nil { - log.Error("[GetRewardByAccount] header not found, impossible case, please check your RPC", "err", err) - return AccountRewardResponse{}, err + // this is the case when there is chain rollback but the reward files of the old chain still remain, skip the reward of unknown blockhash + continue + } + if int(header.Number.Int64()) != fileName.epochBlockNum { + log.Error("[GetRewardByAccount] block number mismatch in reward filename", "reward file blocknum", fileName.epochBlockNum, "header blocknum", int(header.Number.Int64()), "blockhash", header.Hash()) + return AccountRewardResponse{}, errors.New("reward file block number mismatch") } epochReward, err := getEpochReward(account, header) if err != nil { @@ -396,7 +407,7 @@ func (api *API) GetRewardByAccount(account common.Address, begin rpc.BlockNumber return response, nil } -func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]uint64, error) { +func (api *API) getRewardFileNamesInRange(begin, end *rpc.BlockNumber) ([]rewardFileName, error) { beginHeader := api.getHeaderFromApiBlockNum(begin) if beginHeader == nil { return nil, errors.New("illegal begin block number") @@ -420,31 +431,43 @@ func (api *API) getEpochNumbersFromRewardFiles(begin, end *rpc.BlockNumber) ([]u return nil, err } - var epochNumbers []int + var rewardFileNames = []rewardFileName{} for _, file := range files { if !file.IsDir() { - filePrefix, _, found := strings.Cut(file.Name(), ".") + filePrefix, fileSuffix, found := strings.Cut(file.Name(), ".") if found { filePrefixInt, err := strconv.Atoi(filePrefix) if err != nil { log.Warn("[getEpochNumbersFromRewardFiles] found unknown filename format in rewards folder") return nil, err } - epochNumbers = append(epochNumbers, filePrefixInt) + fileSuffixHash := common.StringToHash(fileSuffix) + rewardName := rewardFileName{ + epochBlockNum: filePrefixInt, + epochBlockHash: fileSuffixHash, + } + rewardFileNames = append(rewardFileNames, rewardName) } } } - sort.Ints(epochNumbers) + + sort.Slice(rewardFileNames, func(i, j int) bool { + return rewardFileNames[i].epochBlockNum < rewardFileNames[j].epochBlockNum + }) + + epochNumbers := make([]int, len(rewardFileNames)) + for i, obj := range rewardFileNames { + epochNumbers[i] = obj.epochBlockNum + } + startIndex := sort.SearchInts(epochNumbers, int(beginHeader.Number.Int64())) endIndex := sort.SearchInts(epochNumbers, int(endHeader.Number.Int64())) - var epochNumbersInRange []uint64 - for i := startIndex; i <= endIndex; i++ { - number := uint64(epochNumbers[i]) - epochNumbersInRange = append(epochNumbersInRange, number) + var rewardfileNamesInRange []rewardFileName + for i:= startIndex; i<= endIndex; i++{ + rewardfileNamesInRange = append(rewardfileNamesInRange, rewardFileNames[i]) } - - return epochNumbersInRange, nil + return rewardfileNamesInRange, nil } func getEpochReward(account common.Address, header *types.Header) (AccountEpochReward, error) { @@ -467,7 +490,7 @@ func getEpochReward(account common.Address, header *types.Header) (AccountEpochR log.Warn("[getEpochReward] Failed to decode JSON:", "err", err) return AccountEpochReward{}, err } - + epochReward := AccountEpochReward{ Address: account, EpochBlockNum: header.Number.Uint64(), @@ -484,12 +507,16 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map nodeReward := accountData.(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 + nodeRewardBigInt, ok := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + if ok { + 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 + delegatedBigInt, ok := new(big.Int).SetString(v.(json.Number).String(), 10) + if ok { + rewardObj.DelegatedReward[k] = delegatedBigInt + } } return } @@ -500,12 +527,16 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map nodeReward := accountData.(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 + nodeRewardBigInt, successSetNodeReward := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + if successSetNodeReward { + 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 + delegatedBigInt, successSetDelegatedReward := new(big.Int).SetString(v.(json.Number).String(), 10) + if successSetDelegatedReward { + rewardObj.DelegatedReward[k] = delegatedBigInt + } } return } @@ -517,12 +548,16 @@ func (rewardObj *AccountEpochReward) getRewardAndStatus(account string, data map nodeReward := accountData.(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 + nodeRewardBigInt, successSetNodeReward := new(big.Int).SetString(nodeReward.(json.Number).String(), 10) + if successSetNodeReward { + 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 + delegatedBigInt, successSetDelegatedReward := new(big.Int).SetString(v.(json.Number).String(), 10) + if successSetDelegatedReward { + rewardObj.DelegatedReward[k] = delegatedBigInt + } } return } From 576bdfff79b21dd6b62f762559d254dcbcdab26b Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Mon, 5 May 2025 18:09:29 +0400 Subject: [PATCH 5/5] change method and handle case with no reward --- consensus/XDPoS/api.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/consensus/XDPoS/api.go b/consensus/XDPoS/api.go index 3bc16d57b3..f65e98ce60 100644 --- a/consensus/XDPoS/api.go +++ b/consensus/XDPoS/api.go @@ -389,7 +389,9 @@ func (api *API) GetRewardByAccount(account common.Address, begin rpc.BlockNumber } for _, reward := range epochRewards { - total.TotalAccountReward = new(big.Int).Add(total.TotalAccountReward, reward.AccountReward) + if reward.AccountReward != nil { + total.TotalAccountReward = new(big.Int).Add(total.TotalAccountReward, reward.AccountReward) + } for k, v := range reward.DelegatedReward { _, exist := total.TotalDelegatedReward[k] if exist { @@ -441,7 +443,7 @@ func (api *API) getRewardFileNamesInRange(begin, end *rpc.BlockNumber) ([]reward log.Warn("[getEpochNumbersFromRewardFiles] found unknown filename format in rewards folder") return nil, err } - fileSuffixHash := common.StringToHash(fileSuffix) + fileSuffixHash := common.HexToHash(fileSuffix) rewardName := rewardFileName{ epochBlockNum: filePrefixInt, epochBlockHash: fileSuffixHash, @@ -464,7 +466,7 @@ func (api *API) getRewardFileNamesInRange(begin, end *rpc.BlockNumber) ([]reward endIndex := sort.SearchInts(epochNumbers, int(endHeader.Number.Int64())) var rewardfileNamesInRange []rewardFileName - for i:= startIndex; i<= endIndex; i++{ + for i := startIndex; i <= endIndex; i++ { rewardfileNamesInRange = append(rewardfileNamesInRange, rewardFileNames[i]) } return rewardfileNamesInRange, nil