Skip to content

Commit

Permalink
Merge pull request ethereum#46 from dinhln89/master
Browse files Browse the repository at this point in the history 
Fixed send tx sign to smart contract for block signer.
  • Loading branch information
@ngtuna
ngtuna committed Jun 21, 2018
2 parents 53e7336 + 124f587 commit 20237dd
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 83 deletions.
43 changes: 43 additions & 0 deletions contracts/tomo.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package contracts

import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
"math/big"
)

const (
HexSignMethod = "2fb1b25f"
)

// Send tx sign for block number to smart contract blockSigner.
func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, block *types.Block) {
// Find active account.
account := accounts.Account{}
var wallet accounts.Wallet
if wallets := manager.Wallets(); len(wallets) > 0 {
wallet = wallets[0]
if accts := wallets[0].Accounts(); len(accts) > 0 {
account = accts[0]
}
}

// Create and send tx to smart contract for sign validate block.
blockHex := common.LeftPadBytes(block.Number().Bytes(), 32)
data := common.Hex2Bytes(HexSignMethod)
inputData := append(data, blockHex...)
nonce := pool.State().GetNonce(account.Address)
tx := types.NewTransaction(nonce, common.HexToAddress(common.BlockSigners), big.NewInt(0), 100000, big.NewInt(0), inputData)
txSigned, err := wallet.SignTx(account, tx, chainConfig.ChainId)
if err != nil {
log.Error("Fail to create tx sign", "error", err)
return
}

// Add tx signed to local tx pool.
pool.AddLocal(txSigned)
}
62 changes: 24 additions & 38 deletions eth/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
eth.ApiBackend.gpo = gasprice.NewOracle(eth.ApiBackend, gpoParams)

// Inject hook for send tx sign to smartcontract after insert block into chain.
eth.protocolManager.fetcher.CreateTransactionSign(eth.chainConfig, eth.txPool, eth.accountManager, eth.engine)
if eth.chainConfig.Clique != nil {
eth.protocolManager.fetcher.HookCreateTxSign(eth.chainConfig, eth.TxPool(), eth.AccountManager())
}

if eth.chainConfig.Clique != nil {
c := eth.engine.(*clique.Clique)
Expand All @@ -202,13 +204,13 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
config := ctx.GetConfig()
client, err := ethclient.Dial(config.IPCEndpoint())
if err != nil {
log.Error("TOMO - Fail to connect RPC", "error", err)
log.Error("Fail to connect RPC", "error", err)
return err
}
addr := common.HexToAddress(common.BlockSigners)
blockSigner, err := contract.NewBlockSigner(addr, client)
if err != nil {
log.Error("TOMO - Fail get block signer", "error", err)
log.Error("Fail get block signer", "error", err)
return err
}
opts := new(bind.CallOpts)
Expand All @@ -219,34 +221,30 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
startBlockNumber := number - (rCheckpoint * 2) + 1
endBlockNumber := startBlockNumber + rCheckpoint - 1
signers := make(map[common.Address]*rewardLog)
validators := make(map[common.Address]*rewardLog)
totalSigner := uint64(0)

for i := startBlockNumber; i <= endBlockNumber; i++ {
blockHeader := chain.GetHeaderByNumber(i)
if signer, err := c.RecoverSigner(blockHeader); err != nil {
log.Error("TOMO - Fail recover block signer", "error", err)

// Get signers in blockSigner smartcontract.
addrs, err := blockSigner.GetSigners(opts, new(big.Int).SetUint64(i))
if err != nil {
log.Error("Fail to get signers from smartcontract.", "error", err)
return err
} else {
_, exist := signers[signer]
if exist {
signers[signer].Sign++
} else {
signers[signer] = &rewardLog{1, 0}
}
totalSigner++
}

// Get validator in blockSigner smartcontract.
addrs, _ := blockSigner.GetSigners(opts, new(big.Int).SetUint64(i))
// Filter duplicate address.
if len(addrs) > 0 {
for j := 0; j < len(addrs); j++ {
_, exist := validators[addrs[j]]
addrSigners := make(map[common.Address]bool)
for _, addr := range addrs {
if _, ok := addrSigners[addr]; ok {
} else {
addrSigners[addr] = true
}
}
for addr := range addrSigners {
_, exist := signers[addr]
if exist {
validators[addrs[j]].Sign++
signers[addr].Sign++
} else {
validators[addrs[j]] = &rewardLog{1, 0}
signers[addr] = &rewardLog{1, 0}
}
totalSigner++
}
Expand All @@ -256,33 +254,21 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
chainReward := new(big.Int).SetUint64(chain.Config().Clique.Reward * params.Ether)
// Add reward for signer.
calcReward := new(big.Int)
// Add reward for signers.
for signer, rLog := range signers {
calcReward.Mul(chainReward, new(big.Int).SetUint64(rLog.Sign))
calcReward.Div(calcReward, new(big.Int).SetUint64(totalSigner))
rLog.Reward = float64(calcReward.Int64())

state.AddBalance(signer, calcReward)
}
// Add reward for validators.
for validator, rLog := range validators {
calcReward.Mul(chainReward, new(big.Int).SetUint64(rLog.Sign))
calcReward.Div(calcReward, new(big.Int).SetUint64(totalSigner))
rLog.Reward = float64(calcReward.Int64())

state.AddBalance(validator, calcReward)
}
jsonSigners, err := json.Marshal(signers)
if err != nil {
log.Error("TOMO - Fail to parse json signers", "error", err)
return err
}
jsonValidators, err := json.Marshal(validators)
if err != nil {
log.Error("TOMO - Fail to parse json validators", "error", err)
log.Error("Fail to parse json signers", "error", err)
return err
}

log.Info("TOMO - Calculate reward at checkpoint", "startBlock", startBlockNumber, "endBlock", endBlockNumber, "signers", string(jsonSigners), "totalSigner", totalSigner, "totalReward", chainReward, "validators", string(jsonValidators))
log.Info("Calculate reward at checkpoint", "startBlock", startBlockNumber, "endBlock", endBlockNumber, "signers", string(jsonSigners), "totalSigner", totalSigner, "totalReward", chainReward)
}

return nil
Expand Down
46 changes: 4 additions & 42 deletions eth/fetcher/fetcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/consensus/clique"
"github.com/ethereum/go-ethereum/contracts"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
"math/big"
)

const (
Expand Down Expand Up @@ -741,45 +740,8 @@ func (f *Fetcher) forgetBlock(hash common.Hash) {
}

// Create tx for sign to smartcontract after import block into chain.
func (f *Fetcher) CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, engine consensus.Engine) {
if chainConfig.Clique != nil {
c := engine.(*clique.Clique)

f.importedHook = func(block *types.Block) {
// Find active account.
account := accounts.Account{}
var wallet accounts.Wallet
if wallets := manager.Wallets(); len(wallets) > 0 {
wallet = wallets[0]
if accts := wallets[0].Accounts(); len(accts) > 0 {
account = accts[0]
}
}

// Get block signer.
signer, err := c.RecoverSigner(block.Header())
if err != nil {
log.Error("TOMO - Fail to get signer", "error", err)
return
}

// Not send tx sign when this node is current block miner.
if signer != account.Address {
// Create and send tx to smartcontract for sign validate block.
blockHex := common.LeftPadBytes(block.Number().Bytes(), 32)
data := common.Hex2Bytes("2fb1b25f")
inputData := append(data, blockHex...)
nonce := pool.State().GetNonce(account.Address)
tx := types.NewTransaction(nonce, common.HexToAddress(common.BlockSigners), big.NewInt(0), 100000, big.NewInt(0), inputData)
txSigned, err := wallet.SignTx(account, tx, chainConfig.ChainId)
if err != nil {
log.Error("TOMO - Fail to create tx sign", "error", err)
return
}

// Add tx signed to local tx pool.
pool.AddLocal(txSigned)
}
}
func (f *Fetcher) HookCreateTxSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager) {
f.importedHook = func(block *types.Block) {
contracts.CreateTransactionSign(chainConfig, pool, manager, block)
}
}
12 changes: 9 additions & 3 deletions miner/worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/consensus/clique"
"github.com/ethereum/go-ethereum/consensus/misc"
"github.com/ethereum/go-ethereum/contracts"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -253,13 +254,13 @@ func (self *worker) update() {
case <-self.chainHeadCh:
self.commitNewWork()

// Handle ChainSideEvent
// Handle ChainSideEvent
case ev := <-self.chainSideCh:
self.uncleMu.Lock()
self.possibleUncles[ev.Block.Hash()] = ev.Block
self.uncleMu.Unlock()

// Handle TxPreEvent
// Handle TxPreEvent
case ev := <-self.txCh:
// Apply transaction to the pending state if we're not mining
if atomic.LoadInt32(&self.mining) == 0 {
Expand All @@ -277,7 +278,7 @@ func (self *worker) update() {
}
}

// System stopped
// System stopped
case <-self.txSub.Err():
return
case <-self.chainHeadSub.Err():
Expand Down Expand Up @@ -338,6 +339,11 @@ func (self *worker) wait() {
if mustCommitNewWork {
self.commitNewWork()
}

if self.config.Clique != nil {
// Send tx sign to smart contract blockSigners.
contracts.CreateTransactionSign(self.config, self.eth.TxPool(), self.eth.AccountManager(), block)
}
}
}
}
Expand Down

0 comments on commit 20237dd

Please sign in to comment.