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

Base miner reward updating

Browse source
This commit is contained in:
greg 2018-05-16 16:30:54 -04:00 committed by priom
parent 83c8f4c2c6
commit bc24aef25e
2 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
shyftDb/shyft_database_util.go
View file

@ -12,7 +12,6 @@ import (
"log" "log"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"reflect"
) )
//SBlock type //SBlock type
@ -421,17 +420,16 @@ func WriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s
func WriteMinerRewards(sqldb *sql.DB, block *types.Block) { func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
minerAddr := block.Coinbase().String() minerAddr := block.Coinbase().String()
fmt.Println("\n\n\t\t", minerAddr, "\n\n")
// Calculate the total gas used in the block // Calculate the total gas used in the block
var totalGas big.Int totalGas := new(big.Int)
for _, tx := range block.Transactions() { for _, tx := range block.Transactions() {
totalGas.Add(&totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas()))) totalGas.Add(totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas())))
} }
//TODO: Calculate Block Reward //TODO: Calculate Block Reward
// totalReward := totalGas.Add(&totalGas, MINER_REWARD) // totalReward := totalGas.Add(&totalGas, MINER_REWARD)
totalReward := totalGas totalReward := totalGas
totalRewardString := totalReward.String()
// check if addr exists and update // check if addr exists and update
var minerBalance string var minerBalance string
@ -442,7 +440,9 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// Addr does not exist, thus create new entry // Addr does not exist, thus create new entry
createAddrSqlStatement := `INSERT INTO accounts(addr, balance, txCountAccount) VALUES(($1), ($2), ($3)) RETURNING addr` createAddrSqlStatement := `INSERT INTO accounts(addr, balance, txCountAccount) VALUES(($1), ($2), ($3)) RETURNING addr`
_, insertErr := sqldb.Exec(createAddrSqlStatement, minerAddr, totalRewardString, 0)
// We convert totalReward into a string and postgres converts into number
_, insertErr := sqldb.Exec(createAddrSqlStatement, minerAddr, totalReward.String(), 0)
if insertErr != nil { if insertErr != nil {
panic(insertErr) panic(insertErr)
} }
@ -451,10 +451,22 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
panic(err) panic(err)
} else { } else {
// Addr exists, update existing balance // Addr exists, update existing balance
var newBalance big.Int bigMinerBalance := new(big.Int)
newBalance.Add(addrInfo.balance, totalReward) bigMinerBalance, err := bigMinerBalance.SetString(minerBalance, 0)
updateSQLStatement := `UPDATE accounts SET balance = ($1), txCountAccount = ($2) WHERE addr = ($3)` if !err {
_, updateErr := sqldb.Exec(updateSQLStatement, ) panic(err)
}
newBalance := new(big.Int)
newBalance.Add(newBalance, bigMinerBalance)
newBalance.Add(newBalance, totalReward)
updateSQLStatement := `UPDATE accounts SET balance = ($1) WHERE addr = ($2)`
// We convert totalReward into a string and postgres converts into number
_, updateErr := sqldb.Exec(updateSQLStatement, newBalance.String(), minerAddr)
if updateErr != nil {
panic(updateErr)
}
} }
} }

32
shyftdb/shyft_database_util.go
View file

@ -12,7 +12,6 @@ import (
"log" "log"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"reflect"
) )
//SBlock type //SBlock type
@ -421,17 +420,16 @@ func WriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s
func WriteMinerRewards(sqldb *sql.DB, block *types.Block) { func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
minerAddr := block.Coinbase().String() minerAddr := block.Coinbase().String()
fmt.Println("\n\n\t\t", minerAddr, "\n\n")
// Calculate the total gas used in the block // Calculate the total gas used in the block
var totalGas big.Int totalGas := new(big.Int)
for _, tx := range block.Transactions() { for _, tx := range block.Transactions() {
totalGas.Add(&totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas()))) totalGas.Add(totalGas, new(big.Int).Mul(tx.GasPrice(), new(big.Int).SetUint64(tx.Gas())))
} }
//TODO: Calculate Block Reward //TODO: Calculate Block Reward
// totalReward := totalGas.Add(&totalGas, MINER_REWARD) // totalReward := totalGas.Add(&totalGas, MINER_REWARD)
totalReward := totalGas totalReward := totalGas
totalRewardString := totalReward.String()
// check if addr exists and update // check if addr exists and update
var minerBalance string var minerBalance string
@ -442,7 +440,9 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// Addr does not exist, thus create new entry // Addr does not exist, thus create new entry
createAddrSqlStatement := `INSERT INTO accounts(addr, balance, txCountAccount) VALUES(($1), ($2), ($3)) RETURNING addr` createAddrSqlStatement := `INSERT INTO accounts(addr, balance, txCountAccount) VALUES(($1), ($2), ($3)) RETURNING addr`
_, insertErr := sqldb.Exec(createAddrSqlStatement, minerAddr, totalRewardString, 0)
// We convert totalReward into a string and postgres converts into number
_, insertErr := sqldb.Exec(createAddrSqlStatement, minerAddr, totalReward.String(), 0)
if insertErr != nil { if insertErr != nil {
panic(insertErr) panic(insertErr)
} }
@ -451,10 +451,22 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
panic(err) panic(err)
} else { } else {
// Addr exists, update existing balance // Addr exists, update existing balance
var newBalance big.Int bigMinerBalance := new(big.Int)
newBalance.Add(addrInfo.balance, totalReward) bigMinerBalance, err := bigMinerBalance.SetString(minerBalance, 0)
updateSQLStatement := `UPDATE accounts SET balance = ($1), txCountAccount = ($2) WHERE addr = ($3)` if !err {
_, updateErr := sqldb.Exec(updateSQLStatement, ) panic(err)
}
newBalance := new(big.Int)
newBalance.Add(newBalance, bigMinerBalance)
newBalance.Add(newBalance, totalReward)
updateSQLStatement := `UPDATE accounts SET balance = ($1) WHERE addr = ($2)`
// We convert totalReward into a string and postgres converts into number
_, updateErr := sqldb.Exec(updateSQLStatement, newBalance.String(), minerAddr)
if updateErr != nil {
panic(updateErr)
}
} }
} }