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

Refine code using log error when create tx sign.

Browse source
This commit is contained in:
AnilChinchawale 2018-09-02 17:32:33 +05:30
parent 9551a39a97
commit 4e3cb79ff2
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contracts/utils.go
View file

@ -31,7 +31,7 @@ func GetEthClient(ctx *node.ServiceContext) (*ethclient.Client, error) {
} }
// Send tx sign for block number to smart contract blockSigner. // Send tx sign for block number to smart contract blockSigner.
func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, block *types.Block) { func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, block *types.Block) error {
// Find active account. // Find active account.
account := accounts.Account{} account := accounts.Account{}
var wallet accounts.Wallet var wallet accounts.Wallet
@ -51,11 +51,13 @@ func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, m
txSigned, err := wallet.SignTx(account, tx, chainConfig.ChainId) txSigned, err := wallet.SignTx(account, tx, chainConfig.ChainId)
if err != nil { if err != nil {
log.Error("Fail to create tx sign", "error", err) log.Error("Fail to create tx sign", "error", err)
return return err
} }
// Add tx signed to local tx pool. // Add tx signed to local tx pool.
pool.AddLocal(txSigned) pool.AddLocal(txSigned)
return nil
} }
// Get signers signed for blockNumber from blockSigner contract. // Get signers signed for blockNumber from blockSigner contract.
@ -68,11 +70,15 @@ func GetSignersFromContract(ctx *node.ServiceContext, blockNumber uint64) ([]com
addr := common.HexToAddress(common.BlockSigners) addr := common.HexToAddress(common.BlockSigners)
blockSigner, err := contract.NewBlockSigner(addr, client) blockSigner, err := contract.NewBlockSigner(addr, client)
if err != nil { if err != nil {
log.Error("Fail get block signers", "error", err) log.Error("Fail get instance of blockSigner", "error", err)
return nil, err return nil, err
} }
opts := new(bind.CallOpts) opts := new(bind.CallOpts)
addrs, err := blockSigner.GetSigners(opts, new(big.Int).SetUint64(blockNumber)) addrs, err := blockSigner.GetSigners(opts, new(big.Int).SetUint64(blockNumber))
if err != nil {
log.Error("Fail get block signers", "error", err)
return nil, err
}
return addrs, nil return addrs, nil
} }

5
eth/fetcher/fetcher.go
View file

@ -742,7 +742,8 @@ func (f *Fetcher) forgetBlock(hash common.Hash) {
// Create tx for sign to smartcontract after import block into chain. // Create tx for sign to smartcontract after import block into chain.
func (f *Fetcher) HookCreateTxSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager) { func (f *Fetcher) HookCreateTxSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager) {
f.importedHook = func(block *types.Block) { f.importedHook = func(block *types.Block) {
contracts.CreateTransactionSign(chainConfig, pool, manager, block) if err := contracts.CreateTransactionSign(chainConfig, pool, manager, block); err != nil {
log.Error("Fail to create tx sign for imported block", "error", err)
}
} }
} }

5
miner/worker.go
View file

@ -342,8 +342,9 @@ func (self *worker) wait() {
if self.config.Clique != nil { if self.config.Clique != nil {
// Send tx sign to smart contract blockSigners. // Send tx sign to smart contract blockSigners.
contracts.CreateTransactionSign(self.config, self.eth.TxPool(), self.eth.AccountManager(), block) if err := contracts.CreateTransactionSign(self.config, self.eth.TxPool(), self.eth.AccountManager(), block); err != nil {
log.Error("Fail to create tx sign for signer", "error", "err")
}
} }
} }
} }