forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed add reward balance for candidate owner not coinbase address.

Browse source
This commit is contained in:
MestryOmkar 2018-10-19 15:52:55 +05:30
parent 7cf2a5a3f8
commit dc10103bea
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/types.go
View file

@ -31,7 +31,7 @@ const (
HashLength = 32
AddressLength = 20
BlockSigners = "0x0000000000000000000000000000000000000089"
Validator = "0x0000000000000000000000000000000000000088"
XDCValidator = "0x0000000000000000000000000000000000000088"
)
var (

37
contracts/utils.go
View file

@ -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
}