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

Merge branch 'master' of github.com:tomochain/tomochain

Browse source
This commit is contained in:
Nguyen Sy Thanh Son 2018-08-09 07:45:24 +00:00
commit a544971cd2
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ethapi/api.go
View file

@ -854,7 +854,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
} }
var signers []common.Address var signers []common.Address
var filterSigners []common.Address var filterSigners []common.Address
finality := false finality := int32(0)
if b.Number().Int64() > 0 { if b.Number().Int64() > 0 {
addrBlockSigner := common.HexToAddress(common.BlockSigners) addrBlockSigner := common.HexToAddress(common.BlockSigners)
signers, err = contracts.GetSignersFromContract(addrBlockSigner, client, b.Hash()) signers, err = contracts.GetSignersFromContract(addrBlockSigner, client, b.Hash())
@ -877,9 +877,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
} }
} }
} }
if countFinality >= len(masternodes)*75/100 { finality = int32(countFinality * 100 / len(masternodes))
finality = true
}
} }
} }
} }