From dc10103beafeb69ce024e494f252f0d91a036eaa Mon Sep 17 00:00:00 2001
From: MestryOmkar <mestryomkar@gmail.com>
Date: Fri, 19 Oct 2018 15:52:55 +0530
Subject: [PATCH] Fixed add reward balance for candidate owner not coinbase
 address.

---
 common/types.go    |  2 +-
 contracts/utils.go | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/common/types.go b/common/types.go
index cde9b77247..cb54ada91e 100644
--- a/common/types.go
+++ b/common/types.go
@@ -31,7 +31,7 @@ const (
 	HashLength    = 32
 	AddressLength = 20
 	BlockSigners  = "0x0000000000000000000000000000000000000089"
-	Validator     = "0x0000000000000000000000000000000000000088"
+	XDCValidator     = "0x0000000000000000000000000000000000000088"
 )
 
 var (
diff --git a/contracts/utils.go b/contracts/utils.go
index e98714c6e9..6fac021fc8 100644
--- a/contracts/utils.go
+++ b/contracts/utils.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/contracts/blocksigner/contract"
+	contract2 "github.com/ethereum/go-ethereum/contracts/validator/contract"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
@@ -111,9 +112,25 @@ func GetRewardForCheckpoint(blockSignerAddr common.Address, number uint64, rChec
 		}
 	}
 
+	// Get Owner for signers.
+	owners := make(map[common.Address]*rewardLog)
+	if len(signers) > 0 {
+		for addr, log := range signers {
+			owner, err := GetCandidatesOwnerByAddress(client, addr)
+			if err != nil {
+				owner = addr
+			}
+			if _, ok := owners[owner]; ok {
+				owners[owner].Sign = owners[owner].Sign + log.Sign
+			} else {
+				owners[owner] = log
+			}
+		}
+	}
+
 	log.Info("Calculate reward at checkpoint", "startBlock", startBlockNumber, "endBlock", endBlockNumber)
 
-	return signers, nil
+	return owners, nil
 }
 
 // Calculate reward for signers.
@@ -137,4 +154,22 @@ func CalculateReward(chainReward *big.Int, signers map[common.Address]*rewardLog
 	log.Info("Signers data", "signers", string(jsonSigners), "totalSigner", totalSigner, "totalReward", chainReward)
 
 	return resultSigners, nil
+}
+
+// Get candidate owner by address.
+func GetCandidatesOwnerByAddress(client bind.ContractBackend, addr common.Address) (common.Address, error) {
+	owner := common.Address{}
+	validator, err := contract2.NewXDCValidator(common.HexToAddress(common.XDCValidator), client)
+	if err != nil {
+		log.Error("Fail get instance of IValidator", "error", err)
+		return owner, err
+	}
+	opts := new(bind.CallOpts)
+	owner, err = validator.GetCandidateOwner(opts, addr)
+	if err != nil {
+		log.Error("Fail get candidate owner", "error", err)
+		return owner, err
+	}
+
+	return owner, nil
 }
\ No newline at end of file