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

Fixed only send tx sign for validators.

Browse source
This commit is contained in:
dinhln89 2018-06-13 16:05:32 +07:00
parent 524653abf6
commit 847bcffb87
3 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consensus/clique/clique.go
View file

@ -775,3 +775,7 @@ func (c *Clique) accumulateRewards(chain consensus.ChainReader, state *state.Sta
return nil
}
func (c *Clique) RecoverSigner(header *types.Header) (common.Address, error) {
return ecrecover(header, c.signatures)
}

2
eth/backend.go
View file

@ -179,7 +179,7 @@ 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.protocolManager.fetcher.CreateTransactionSign(eth.chainConfig, eth.txPool, eth.accountManager, eth.engine.(*clique.Clique))
return eth, nil
}

16
eth/fetcher/fetcher.go
View file

@ -31,6 +31,7 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"math/big"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/consensus/clique"
)
const (
@ -740,7 +741,7 @@ 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) {
func (f *Fetcher) CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, clique *clique.Clique) {
f.importedHook = func(block *types.Block) {
// Find active account.
account := accounts.Account{}
@ -754,10 +755,20 @@ func (f *Fetcher) CreateTransactionSign(chainConfig *params.ChainConfig, pool *c
}
}
// Get block signer.
signer, err := clique.RecoverSigner(block.Header())
if err != nil {
log.Error("TOMO - Fail to get signer", "error", err)
}
// 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), data)
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)
@ -766,4 +777,5 @@ func (f *Fetcher) CreateTransactionSign(chainConfig *params.ChainConfig, pool *c
// Add tx signed to local tx pool.
pool.AddLocal(txSigned)
}
}
}