forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Uncle reward logic implimented

Browse source
This commit is contained in:
greg 2018-05-17 17:25:44 -04:00 committed by priom
parent 64453a4d5b
commit d19ff3191b
2 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
shyftDb/shyft_database_util.go
View file

@ -435,24 +435,30 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
totalMinerReward := totalGas.Add(totalGas, Rewards.ShyftMinerBlockReward) totalMinerReward := totalGas.Add(totalGas, Rewards.ShyftMinerBlockReward)
// References:
// https://ethereum.stackexchange.com/questions/27172/different-uncles-reward
// line 551 in consensus.go (shyft_go-ethereum/consensus/ethash/consensus.go)
// Some weird constants to avoid constant memory allocs for them.
var big8 = big.NewInt(8)
var uncleRewards []*big.Int
var uncleAddrs []string
// uncleReward is overwritten after each iteration
uncleReward := new(big.Int)
for _, uncle := range block.Uncles() {
uncleReward.Add(uncle.Number, big8)
uncleReward.Sub(uncleReward, block.Number())
uncleReward.Mul(uncleReward, Rewards.ShyftMinerBlockReward)
uncleReward.Div(uncleReward, big8)
uncleRewards = append(uncleRewards, uncleReward)
uncleAddrs = append(uncleAddrs, uncle.Coinbase.String())
}
StoreReward(sqldb, minerAddr, totalMinerReward) StoreReward(sqldb, minerAddr, totalMinerReward)
StoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward) StoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward)
for i := 0; i < len(uncleAddrs); i++ {
//https://ethereum.stackexchange.com/questions/27172/different-uncles-reward StoreReward(sqldb, uncleAddrs[i], uncleRewards[i])
// Accumulate the rewards for the miner and any included uncles }
//reward := new(big.Int).Set(blockReward)
//r := new(big.Int)
//for _, uncle := range uncles {
// r.Add(uncle.Number, big8)
// r.Sub(r, header.Number)
// r.Mul(r, blockReward)
// r.Div(r, big8)
// state.AddBalance(uncle.Coinbase, r)
//
// r.Div(blockReward, big32)
// reward.Add(reward, r)
//}
//state.AddBalance(header.Coinbase, reward)
} }
func StoreReward(sqldb *sql.DB, address string, reward *big.Int) { func StoreReward(sqldb *sql.DB, address string, reward *big.Int) {

38
shyftdb/shyft_database_util.go
View file

@ -435,24 +435,30 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
totalMinerReward := totalGas.Add(totalGas, Rewards.ShyftMinerBlockReward) totalMinerReward := totalGas.Add(totalGas, Rewards.ShyftMinerBlockReward)
// References:
// https://ethereum.stackexchange.com/questions/27172/different-uncles-reward
// line 551 in consensus.go (shyft_go-ethereum/consensus/ethash/consensus.go)
// Some weird constants to avoid constant memory allocs for them.
var big8 = big.NewInt(8)
var uncleRewards []*big.Int
var uncleAddrs []string
// uncleReward is overwritten after each iteration
uncleReward := new(big.Int)
for _, uncle := range block.Uncles() {
uncleReward.Add(uncle.Number, big8)
uncleReward.Sub(uncleReward, block.Number())
uncleReward.Mul(uncleReward, Rewards.ShyftMinerBlockReward)
uncleReward.Div(uncleReward, big8)
uncleRewards = append(uncleRewards, uncleReward)
uncleAddrs = append(uncleAddrs, uncle.Coinbase.String())
}
StoreReward(sqldb, minerAddr, totalMinerReward) StoreReward(sqldb, minerAddr, totalMinerReward)
StoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward) StoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward)
for i := 0; i < len(uncleAddrs); i++ {
//https://ethereum.stackexchange.com/questions/27172/different-uncles-reward StoreReward(sqldb, uncleAddrs[i], uncleRewards[i])
// Accumulate the rewards for the miner and any included uncles }
//reward := new(big.Int).Set(blockReward)
//r := new(big.Int)
//for _, uncle := range uncles {
// r.Add(uncle.Number, big8)
// r.Sub(r, header.Number)
// r.Mul(r, blockReward)
// r.Div(r, big8)
// state.AddBalance(uncle.Coinbase, r)
//
// r.Div(blockReward, big32)
// reward.Add(reward, r)
//}
//state.AddBalance(header.Coinbase, reward)
} }
func StoreReward(sqldb *sql.DB, address string, reward *big.Int) { func StoreReward(sqldb *sql.DB, address string, reward *big.Int) {