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

masternode should also count to his turn in case some of his friends are down

Browse source
This commit is contained in:
MestryOmkar 2018-10-22 10:53:15 +05:30
parent 7adecc32d3
commit ec421b98b1
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
consensus/clique/clique.go
View file

@ -48,7 +48,6 @@ const (
inmemorySnapshots = 128 // Number of recent vote snapshots to keep in memory inmemorySnapshots = 128 // Number of recent vote snapshots to keep in memory
inmemorySignatures = 4096 // Number of recent block signatures to keep in memory inmemorySignatures = 4096 // Number of recent block signatures to keep in memory
wiggleTime = 500 * time.Millisecond // Random delay (per signer) to allow concurrent signers wiggleTime = 500 * time.Millisecond // Random delay (per signer) to allow concurrent signers
) )
type Masternode struct { type Masternode struct {
@ -405,23 +404,29 @@ func (c *Clique) GetMasternodes(chain consensus.ChainReader, header *types.Heade
return masternodes return masternodes
} }
func YourTurn(masternodes []common.Address, snap *Snapshot, header *types.Header, cur common.Address) (bool, error) { func (c *Clique) GetPeriod() uint64 { return c.config.Period }
func YourTurn(masternodes []common.Address, snap *Snapshot, header *types.Header, cur common.Address) (int, int, bool, error) {
pre := common.Address{} pre := common.Address{}
// masternode[0] has chance to create block 1 // masternode[0] has chance to create block 1
var err error
preIndex := -1 preIndex := -1
if header.Number.Uint64() != 0 { if header.Number.Uint64() != 0 {
pre, err := ecrecover(header, snap.sigcache) pre, err = ecrecover(header, snap.sigcache)
if err != nil { if err != nil {
return false, err return 0, 0, false, err
} }
preIndex = position(masternodes, pre) preIndex = position(masternodes, pre)
} }
curIndex := position(masternodes, cur) curIndex := position(masternodes, cur)
log.Info("Debugging info", "number of masternodes", len(masternodes), "previous", pre, "position", preIndex, "current", cur, "position", curIndex) log.Info("Masternodes cycle info", "number of masternodes", len(masternodes), "previous", pre, "position", preIndex, "current", cur, "position", curIndex)
for i, s := range masternodes { for i, s := range masternodes {
fmt.Printf("%d - %s\n", i, s.String()) fmt.Printf("%d - %s\n", i, s.String())
} }
return (preIndex+1)%len(masternodes) == curIndex, nil if (preIndex+1)%len(masternodes) == curIndex {
return preIndex, curIndex, true, nil
}
return preIndex, curIndex, false, nil
} }
// snapshot retrieves the authorization snapshot at a given point in time. // snapshot retrieves the authorization snapshot at a given point in time.

1
core/blockchain.go
View file

@ -1243,6 +1243,7 @@ func (st *insertStats) report(chain []*types.Block, index int, cache common.Stor
context = append(context, []interface{}{"ignored", st.ignored}...) context = append(context, []interface{}{"ignored", st.ignored}...)
} }
log.Info("Imported new chain segment", context...) log.Info("Imported new chain segment", context...)
*st = insertStats{startTime: now, lastIndex: index + 1} *st = insertStats{startTime: now, lastIndex: index + 1}
} }
} }

6
eth/backend.go
View file

@ -471,9 +471,9 @@ func (s *Ethereum) StartStaking(local bool) error {
return nil return nil
} }
func (s *Ethereum) StopStaking() { s.miner.Stop() } func (s *Ethereum) StopStaking() { s.miner.Stop() }
func (s *Ethereum) IsStaking() bool { return s.miner.Mining() } func (s *Ethereum) IsStaking() bool { return s.miner.Mining() }
func (s *Ethereum) Miner() *miner.Miner { return s.miner } func (s *Ethereum) Miner() *miner.Miner { return s.miner }
func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManager } func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManager }
func (s *Ethereum) BlockChain() *core.BlockChain { return s.blockchain } func (s *Ethereum) BlockChain() *core.BlockChain { return s.blockchain }