ChronosXYZ/dione
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix approve count for PREPARE state in consensus

Browse Source
This commit is contained in:
ChronosX88 2021-07-20 01:40:49 +03:00
parent cbce24fdce
commit 550d69fb26
Signed by: ChronosXYZ
GPG Key ID: 085A69A82C8C511A
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockchain/pool/blockpool.go
View File

@ -3,6 +3,7 @@ package pool
import ( import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
"fmt"
"time" "time"
"github.com/asaskevich/EventBus" "github.com/asaskevich/EventBus"
@ -37,6 +38,7 @@ func (bp *BlockPool) AddBlock(block *types.Block) error {
if err != nil { if err != nil {
return err return err
} }
logrus.WithField("hash", fmt.Sprintf("%x", block.Header.Hash)).Debug("New block discovered")
bp.bus.Publish("blockpool:knownBlockAdded", block) bp.bus.Publish("blockpool:knownBlockAdded", block)
return nil return nil
} }

5
blockchain/sync/sync_mgr.go
View File

@ -271,7 +271,10 @@ func (sm *syncManager) onNewBlock(message *pubsub.PubSubMessage) {
err = sm.blockpool.StoreBlock(&block) err = sm.blockpool.StoreBlock(&block)
if err != nil { if err != nil {
logrus.WithField("err", err.Error()).Error("failed to store block from NewBlock message") logrus.WithFields(logrus.Fields{
"err": err.Error(),
"blockHash": fmt.Sprintf("%x", block.Header.Hash),
}).Error("failed to store block from NewBlock message")
return return
} }
} }

2
config/win_config.go
View File

@ -2,4 +2,4 @@ package config
import "math/big" import "math/big"
var ExpectedLeadersPerEpoch = big.NewInt(5) var ExpectedLeadersPerEpoch = big.NewInt(1)

22
consensus/consensus.go
View File

@ -3,6 +3,7 @@ package consensus
import ( import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt"
"math/big" "math/big"
"sync" "sync"
@ -122,6 +123,7 @@ func (pcm *PBFTConsensusManager) propose(blk *types3.Block) error {
} }
pcm.psb.BroadcastToServiceTopic(prePrepareMsg) pcm.psb.BroadcastToServiceTopic(prePrepareMsg)
pcm.blockPool.AddBlock(blk) pcm.blockPool.AddBlock(blk)
logrus.WithField("blockHash", fmt.Sprintf("%x", blk.Header.Hash)).Debugf("Entered into PREPREPARED state")
pcm.state.status = StateStatusPrePrepared pcm.state.status = StateStatusPrePrepared
return nil return nil
} }
@ -157,6 +159,10 @@ func (pcm *PBFTConsensusManager) handlePrePrepare(message *pubsub.PubSubMessage)
} }
pcm.msgLog.AddMessage(cmsg) pcm.msgLog.AddMessage(cmsg)
logrus.WithFields(logrus.Fields{
"blockHash": fmt.Sprintf("%x", cmsg.Block.Header.Hash),
"from": message.From.String(),
}).Debug("Received PREPREPARE message")
pcm.blockPool.AddBlock(cmsg.Block) pcm.blockPool.AddBlock(cmsg.Block)
prepareMsg, err := NewMessage(cmsg, types.ConsensusMessageTypePrepare, pcm.privKey) prepareMsg, err := NewMessage(cmsg, types.ConsensusMessageTypePrepare, pcm.privKey)
@ -165,6 +171,7 @@ func (pcm *PBFTConsensusManager) handlePrePrepare(message *pubsub.PubSubMessage)
return return
} }
logrus.WithField("blockHash", fmt.Sprintf("%x", prePrepare.Block.Header.Hash)).Debugf("Entered into PREPREPARED state")
pcm.psb.BroadcastToServiceTopic(prepareMsg) pcm.psb.BroadcastToServiceTopic(prepareMsg)
pcm.state.status = StateStatusPrePrepared pcm.state.status = StateStatusPrePrepared
} }
@ -187,7 +194,7 @@ func (pcm *PBFTConsensusManager) handlePrepare(message *pubsub.PubSubMessage) {
} }
if _, err := pcm.blockPool.GetBlock(cmsg.Blockhash); errors.Is(err, cache.ErrNotFound) { if _, err := pcm.blockPool.GetBlock(cmsg.Blockhash); errors.Is(err, cache.ErrNotFound) {
logrus.Warnf("received unknown block %x", cmsg.Blockhash) logrus.WithField("blockHash", cmsg.Blockhash).Warnf("received unknown block %x", cmsg.Blockhash)
return return
} }
@ -202,14 +209,19 @@ func (pcm *PBFTConsensusManager) handlePrepare(message *pubsub.PubSubMessage) {
} }
pcm.msgLog.AddMessage(cmsg) pcm.msgLog.AddMessage(cmsg)
logrus.WithFields(logrus.Fields{
"blockHash": fmt.Sprintf("%x", cmsg.Blockhash),
"from": message.From.String(),
}).Debug("Received PREPARE message")
if len(pcm.msgLog.Get(types.ConsensusMessageTypePrepare, cmsg.Blockhash)) >= pcm.minApprovals { if len(pcm.msgLog.Get(types.ConsensusMessageTypePrepare, cmsg.Blockhash)) >= pcm.minApprovals-1 {
commitMsg, err := NewMessage(cmsg, types.ConsensusMessageTypeCommit, pcm.privKey) commitMsg, err := NewMessage(cmsg, types.ConsensusMessageTypeCommit, pcm.privKey)
if err != nil { if err != nil {
logrus.Errorf("failed to create commit message: %v", err) logrus.Errorf("failed to create commit message: %v", err)
return return
} }
pcm.psb.BroadcastToServiceTopic(commitMsg) pcm.psb.BroadcastToServiceTopic(commitMsg)
logrus.WithField("blockHash", fmt.Sprintf("%x", cmsg.Blockhash)).Debugf("Entered into PREPARED state")
pcm.state.status = StateStatusPrepared pcm.state.status = StateStatusPrepared
} }
} }
@ -247,6 +259,11 @@ func (pcm *PBFTConsensusManager) handleCommit(message *pubsub.PubSubMessage) {
pcm.msgLog.AddMessage(cmsg) pcm.msgLog.AddMessage(cmsg)
logrus.WithFields(logrus.Fields{
"blockHash": fmt.Sprintf("%x", cmsg.Blockhash),
"from": message.From.String(),
}).Debug("Received COMMIT message")
if len(pcm.msgLog.Get(types.ConsensusMessageTypeCommit, cmsg.Blockhash)) >= pcm.minApprovals { if len(pcm.msgLog.Get(types.ConsensusMessageTypeCommit, cmsg.Blockhash)) >= pcm.minApprovals {
block, err := pcm.blockPool.GetBlock(cmsg.Blockhash) block, err := pcm.blockPool.GetBlock(cmsg.Blockhash)
if err != nil { if err != nil {
@ -254,6 +271,7 @@ func (pcm *PBFTConsensusManager) handleCommit(message *pubsub.PubSubMessage) {
return return
} }
pcm.blockPool.AddAcceptedBlock(block) pcm.blockPool.AddAcceptedBlock(block)
logrus.WithField("blockHash", fmt.Sprintf("%x", cmsg.Blockhash)).Debugf("Entered into COMMIT state")
pcm.state.status = StateStatusCommited pcm.state.status = StateStatusCommited
} }
} }