Skip to content

P
plugin
Commit d9cf7b75 authored by caopingcp's avatar caopingcp Committed by vipwzw
Browse files
Options

fix qbft ut

parent 140fe92a
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 167 deletions
chain33.para.toml
View file @ d9cf7b75
......@@ -337,8 +337,8 @@ Enable=0
Enable=0
ForkStorageLocalDB=0
[fork.sub.qbftNode]
Enable=0
[fork.sub.multisig]
Enable=0
......
plugin/consensus/qbft/chain33.qbft.toml
View file @ d9cf7b75
Title="qbft"
Title="local"
[log]
# 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
......@@ -86,8 +86,7 @@ timeoutPrecommit=2000
timeoutPrecommitDelta=500
timeoutCommit=500
skipTimeoutCommit=false
createEmptyBlocks=true
createEmptyBlocksInterval=2
emptyBlockInterval=2
genesisFile="genesis_file.json"
privFile="priv_validator_0.json"
dbPath="datadir/qbft"
......
plugin/consensus/qbft/consensus_state.go
View file @ d9cf7b75
......@@ -312,7 +312,7 @@ func (cs *ConsensusState) updateToState(state State) {
return
}
// disable gossip votes
if useAggSig && gossipVotes.Load().(bool) {
if UseAggSig() && gossipVotes.Load().(bool) {
gossipVotes.Store(false)
}
......@@ -582,7 +582,7 @@ func (cs *ConsensusState) enterNewRound(height int64, round int) {
qbftlog.Info(fmt.Sprintf("enterNewRound(%v/%v). Current: %v/%v/%v", height, round, cs.Height, cs.Round, cs.Step))
// disable gossip votes
if useAggSig && gossipVotes.Load().(bool) {
if UseAggSig() && gossipVotes.Load().(bool) {
gossipVotes.Store(false)
}
// Increment validators if necessary
......@@ -614,10 +614,10 @@ func (cs *ConsensusState) enterNewRound(height int64, round int) {
// Wait for txs to be available in the mempool
// before we enterPropose in round 0.
waitForTxs := cs.WaitForTxs() && round == getStartRound(cs.state)
waitForTxs := round == getStartRound(cs.state)
if waitForTxs {
if createEmptyBlocksInterval > 0 {
cs.scheduleTimeout(cs.EmptyBlocksInterval(), height, round, ttypes.RoundStepNewRound)
if emptyBlockInterval.Load().(int32) > 0 {
cs.scheduleTimeout(cs.EmptyBlockInterval(), height, round, ttypes.RoundStepNewRound)
}
go cs.proposalHeartbeat(height, round)
} else {
......@@ -731,7 +731,7 @@ func (cs *ConsensusState) defaultDecideProposal(height int64, round int) {
// Decide on block
if cs.ValidBlock != nil {
if preExec {
if preExec.Load().(bool) {
// If there is valid block, PreExec that.
pblockNew := cs.client.PreExecBlock(cs.ValidBlock.Data, false)
if pblockNew == nil {
......@@ -826,7 +826,7 @@ func (cs *ConsensusState) createProposalBlock() (block *ttypes.QbftBlock) {
}
block.Data.TxHash = merkle.CalcMerkleRoot(cfg, block.Data.Height, block.Data.Txs)
if preExec {
if preExec.Load().(bool) {
pblockNew := cs.client.PreExecBlock(block.Data, false)
if pblockNew == nil {
qbftlog.Error("createProposalBlock PreExecBlock fail")
......@@ -905,7 +905,7 @@ func (cs *ConsensusState) defaultDoPrevote(height int64, round int) {
return
}
if preExec && !cs.isProposer() {
if preExec.Load().(bool) && !cs.isProposer() {
// PreExec proposal block
blockCopy := *cs.ProposalBlock.Data
blockNew := cs.client.PreExecBlock(&blockCopy, true)
......@@ -959,7 +959,7 @@ func (cs *ConsensusState) enterPrevoteWait(height int64, round int) {
}()
// enable gossip votes in case other validators enterAggPrevoteWait
if useAggSig && !cs.isProposer() && cs.Votes.Prevotes(round).GetAggVote() == nil {
if UseAggSig() && !cs.isProposer() && cs.Votes.Prevotes(round).GetAggVote() == nil {
gossipVotes.Store(true)
}
......@@ -1090,7 +1090,7 @@ func (cs *ConsensusState) enterPrecommitWait(height int64, round int) {
}()
// enable gossip votes in case other validators enterAggPrecommitWait
if useAggSig && !cs.isProposer() && cs.Votes.Precommits(round).GetAggVote() == nil {
if UseAggSig() && !cs.isProposer() && cs.Votes.Precommits(round).GetAggVote() == nil {
gossipVotes.Store(true)
}
......@@ -1528,7 +1528,7 @@ func (cs *ConsensusState) tryAddAggVote(aggVoteRaw *tmtypes.QbftAggVote, peerID
cs.enterPrecommit(height, int(aggVote.Round))
if len(blockID.Hash) != 0 {
cs.enterCommit(height, int(aggVote.Round))
if skipTimeoutCommit && precommits.HasAll() {
if skipTimeoutCommit.Load().(bool) && precommits.HasAll() {
cs.enterNewRound(cs.Height, 0)
}
} else {
......@@ -1601,7 +1601,7 @@ func (cs *ConsensusState) addVote(vote *ttypes.Vote, peerID string, peerIP strin
cs.broadcastChannel <- MsgInfo{TypeID: ttypes.HasVoteID, Msg: hasVoteMsg, PeerID: "", PeerIP: ""}
// if we can skip timeoutCommit and have all the votes now,
if skipTimeoutCommit && cs.LastCommit.HasAll() {
if skipTimeoutCommit.Load().(bool) && cs.LastCommit.HasAll() {
// go straight to new round (skip timeout commit)
// cs.scheduleTimeout(time.Duration(0), cs.Height, 0, cstypes.RoundStepNewHeight)
cs.enterNewRound(cs.Height, 0)
......@@ -1696,7 +1696,7 @@ func (cs *ConsensusState) addVote(vote *ttypes.Vote, peerID string, peerIP strin
blockID, ok := prevotes.TwoThirdsMajority()
if ok {
if ttypes.RoundStepPrevote <= cs.Step && (cs.isProposalComplete() || len(blockID.Hash) == 0) {
if useAggSig && cs.isProposer() && prevotes.GetAggVote() == nil {
if UseAggSig() && cs.isProposer() && prevotes.GetAggVote() == nil {
err := prevotes.SetAggVote()
if err != nil {
qbftlog.Error("prevotes SetAggVote fail", "err", err)
......@@ -1734,7 +1734,7 @@ func (cs *ConsensusState) addVote(vote *ttypes.Vote, peerID string, peerIP strin
// Executed as TwoThirdsMajority could be from a higher round
cs.enterNewRound(height, int(vote.Round))
cs.enterPrecommit(height, int(vote.Round))
if useAggSig && cs.isProposer() && precommits.GetAggVote() == nil {
if UseAggSig() && cs.isProposer() && precommits.GetAggVote() == nil {
err := precommits.SetAggVote()
if err != nil {
qbftlog.Error("precommits SetAggVote fail", "err", err)
......@@ -1746,7 +1746,7 @@ func (cs *ConsensusState) addVote(vote *ttypes.Vote, peerID string, peerIP strin
}
if len(blockID.Hash) != 0 {
cs.enterCommit(height, int(vote.Round))
if skipTimeoutCommit && precommits.HasAll() {
if skipTimeoutCommit.Load().(bool) && precommits.HasAll() {
cs.enterNewRound(cs.Height, 0)
}
} else {
......@@ -1779,7 +1779,7 @@ func (cs *ConsensusState) signVote(voteType byte, hash []byte) (*ttypes.Vote, er
Type: uint32(voteType),
BlockID: &tmtypes.QbftBlockID{Hash: hash},
Signature: nil,
UseAggSig: useAggSig,
UseAggSig: UseAggSig(),
},
}
err := cs.privValidator.SignVote(cs.state.ChainID, vote)
......@@ -1797,7 +1797,7 @@ func (cs *ConsensusState) signAddVote(voteType byte, hash []byte) *ttypes.Vote {
if err == nil {
// send to self
cs.sendInternalMessage(MsgInfo{TypeID: ttypes.VoteID, Msg: vote.QbftVote, PeerID: cs.ourID, PeerIP: ""})
if useAggSig {
if UseAggSig() {
// send to proposer
cs.unicastChannel <- MsgInfo{TypeID: ttypes.VoteID, Msg: vote.QbftVote, PeerID: cs.getProposerID(), PeerIP: ""}
// wait for aggregate vote
......@@ -1837,32 +1837,27 @@ func CompareHRS(h1 int64, r1 int, s1 ttypes.RoundStepType, h2 int64, r2 int, s2
// Commit returns the amount of time to wait for straggler votes after receiving +2/3 precommits for a single block (ie. a commit).
func (cs *ConsensusState) Commit(t time.Time) time.Time {
return t.Add(time.Duration(timeoutCommit) * time.Millisecond)
return t.Add(time.Duration(timeoutCommit.Load().(int32)) * time.Millisecond)
}
// Propose returns the amount of time to wait for a proposal
func (cs *ConsensusState) Propose(round int) time.Duration {
return time.Duration(timeoutPropose+timeoutProposeDelta*int32(round)) * time.Millisecond
return time.Duration(timeoutPropose.Load().(int32)+timeoutProposeDelta.Load().(int32)*int32(round)) * time.Millisecond
}
// Prevote returns the amount of time to wait for straggler votes after receiving any +2/3 prevotes
func (cs *ConsensusState) Prevote(round int) time.Duration {
return time.Duration(timeoutPrevote+timeoutPrevoteDelta*int32(round)) * time.Millisecond
return time.Duration(timeoutPrevote.Load().(int32)+timeoutPrevoteDelta.Load().(int32)*int32(round)) * time.Millisecond
}
// Precommit returns the amount of time to wait for straggler votes after receiving any +2/3 precommits
func (cs *ConsensusState) Precommit(round int) time.Duration {
return time.Duration(timeoutPrecommit+timeoutPrecommitDelta*int32(round)) * time.Millisecond
return time.Duration(timeoutPrecommit.Load().(int32)+timeoutPrecommitDelta.Load().(int32)*int32(round)) * time.Millisecond
}
// WaitForTxs returns true if the consensus should wait for transactions before entering the propose step
func (cs *ConsensusState) WaitForTxs() bool {
return !createEmptyBlocks || createEmptyBlocksInterval > 0
}
// EmptyBlocksInterval returns the amount of time to wait before proposing an empty block or starting the propose timer if there are no txs available
func (cs *ConsensusState) EmptyBlocksInterval() time.Duration {
return time.Duration(createEmptyBlocksInterval) * time.Second
// EmptyBlockInterval returns the amount of time to wait before proposing an empty block or starting the propose timer if there are no txs available
func (cs *ConsensusState) EmptyBlockInterval() time.Duration {
return time.Duration(emptyBlockInterval.Load().(int32)) * time.Second
}
// PeerGossipSleep returns the amount of time to sleep if there is nothing to send from the ConsensusReactor
......
plugin/consensus/qbft/execution.go
View file @ d9cf7b75
......@@ -74,7 +74,7 @@ func updateState(s State, blockID ttypes.BlockID, block *ttypes.QbftBlock) (Stat
seq := s.Sequence + 1
// include situation multiBlock=1
if seq == multiBlocks {
if seq == multiBlocks.Load().(int64) {
// Update validator accums and set state variables
nextValSet.IncrementAccum(1)
seq = 0
......
plugin/consensus/qbft/peer_set.go
View file @ d9cf7b75
......@@ -398,25 +398,15 @@ func (pc *peerConn) TrySend(msg MsgInfo) bool {
// PickSendVote picks a vote and sends it to the peer.
// Returns true if vote was sent.
func (pc *peerConn) PickSendVote(votes ttypes.VoteSetReader) bool {
if useAggSig {
aggVote := votes.GetAggVote()
if aggVote != nil {
if votes.IsCommit() {
pc.state.ensureCatchupCommitRound(votes.Height(), votes.Round(), votes.Size())
}
if pc.state.Height != aggVote.Height ||
(pc.state.Round != int(aggVote.Round) && pc.state.CatchupCommitRound != int(aggVote.Round)) {
return false
}
if (aggVote.Type == uint32(ttypes.VoteTypePrevote) && pc.state.AggPrevote) ||
(aggVote.Type == uint32(ttypes.VoteTypePrecommit) && pc.state.AggPrecommit) {
return false
}
msg := MsgInfo{TypeID: ttypes.AggVoteID, Msg: aggVote.QbftAggVote, PeerID: pc.id, PeerIP: pc.ip.String()}
qbftlog.Debug("Sending aggregate vote message", "msg", msg)
if pc.Send(msg) {
pc.state.SetHasAggVote(aggVote)
return true
if UseAggSig() {
if votes.GetAggVote() != nil {
if aggVote, ok := pc.state.PickAggVoteToSend(votes); ok {
msg := MsgInfo{TypeID: ttypes.AggVoteID, Msg: aggVote.QbftAggVote, PeerID: pc.id, PeerIP: pc.ip.String()}
qbftlog.Debug("Sending aggregate vote message", "msg", msg)
if pc.Send(msg) {
pc.state.SetHasAggVote(aggVote)
return true
}
}
return false
}
......@@ -575,6 +565,7 @@ FOR_LOOP:
} else if pkt.TypeID == ttypes.AggVoteID {
aggVote := &ttypes.AggVote{QbftAggVote: realMsg.(*tmtypes.QbftAggVote)}
qbftlog.Debug("Receiving aggregate vote", "aggVote-height", aggVote.Height, "peerip", pc.ip.String())
pc.state.SetHasAggVote(aggVote)
}
} else if pkt.TypeID == ttypes.ProposalHeartbeatID {
pc.heartbeatQueue <- realMsg.(*tmtypes.QbftHeartbeat)
......@@ -689,7 +680,7 @@ OUTER_LOOP:
}
rs := pc.myState.GetRoundState()
prs := pc.state
prs := pc.state.GetRoundState()
// If the peer is on a previous height, help catch up.
if (0 < prs.Height) && (prs.Height < rs.Height) {
......@@ -713,7 +704,7 @@ OUTER_LOOP:
"selfHeight", rs.Height, "peer(H/R/S)", fmt.Sprintf("%v/%v/%v", prs.Height, prs.Round, prs.Step),
"block(H/R/hash)", fmt.Sprintf("%v/%v/%X", proposalBlock.Header.Height, proposalBlock.Header.Round, newBlock.Hash()))
if pc.Send(msg) {
prs.SetHasProposalBlock(newBlock)
pc.state.SetHasProposalBlock(newBlock)
}
continue OUTER_LOOP
}
......@@ -738,7 +729,7 @@ OUTER_LOOP:
qbftlog.Debug(fmt.Sprintf("Sending proposal. Self state: %v/%v/%v", rs.Height, rs.Round, rs.Step),
"peerip", pc.ip.String(), "proposal-height", rs.Proposal.Height, "proposal-round", rs.Proposal.Round)
if pc.Send(msg) {
prs.SetHasProposal(rs.Proposal)
pc.state.SetHasProposal(rs.Proposal)
}
}
// ProposalPOL: lets peer know which POL votes we have so far.
......@@ -764,7 +755,7 @@ OUTER_LOOP:
qbftlog.Debug(fmt.Sprintf("Sending proposal block. Self state: %v/%v/%v", rs.Height, rs.Round, rs.Step),
"peerip", pc.ip.String(), "block-height", rs.ProposalBlock.Header.Height, "block-round", rs.ProposalBlock.Header.Round)
if pc.Send(msg) {
prs.SetHasProposalBlock(rs.ProposalBlock)
pc.state.SetHasProposalBlock(rs.ProposalBlock)
}
continue OUTER_LOOP
}
......@@ -789,7 +780,7 @@ OUTER_LOOP:
}
rs := pc.myState.GetRoundState()
prs := pc.state
prs := pc.state.GetRoundState()
switch sleeping {
case 1: // First sleep
......@@ -800,8 +791,8 @@ OUTER_LOOP:
// If height matches, then send LastCommit, Prevotes, Precommits.
if rs.Height == prs.Height {
if !useAggSig || gossipVotes.Load().(bool) {
if pc.gossipVotesForHeight(rs, prs.GetRoundState()) {
if !UseAggSig() || gossipVotes.Load().(bool) {
if pc.gossipVotesForHeight(rs, prs) {
continue OUTER_LOOP
}
}
......@@ -917,7 +908,7 @@ OUTER_LOOP:
// Maybe send Height/Round/Prevotes
{
rs := pc.myState.GetRoundState()
prs := pc.state
prs := pc.state.GetRoundState()
if rs.Height == prs.Height {
if maj23, ok := rs.Votes.Prevotes(prs.Round).TwoThirdsMajority(); ok {
msg := MsgInfo{TypeID: ttypes.VoteSetMaj23ID, Msg: &tmtypes.QbftVoteSetMaj23Msg{
......@@ -1029,7 +1020,7 @@ func (ps *PeerConnState) SetHasProposal(proposal *tmtypes.QbftProposal) {
if ps.Proposal {
return
}
qbftlog.Debug("Peer set proposal", "peerip", ps.ip.String(),
qbftlog.Debug("Peer set proposal", "peerIP", ps.ip.String(),
"peer-state", fmt.Sprintf("%v/%v/%v", ps.Height, ps.Round, ps.Step),
"proposal(H/R/Hash)", fmt.Sprintf("%v/%v/%X", proposal.Height, proposal.Round, proposal.Blockhash))
ps.Proposal = true
......@@ -1080,6 +1071,30 @@ func (ps *PeerConnState) SetHasAggVote(aggVote *ttypes.AggVote) {
}
}
// PickAggVoteToSend picks aggregate vote to send to the peer.
// Returns true if a vote was picked.
func (ps *PeerConnState) PickAggVoteToSend(votes ttypes.VoteSetReader) (vote *ttypes.AggVote, ok bool) {
ps.mtx.Lock()
defer ps.mtx.Unlock()
aggVote := votes.GetAggVote()
if aggVote == nil {
return nil, false
}
if votes.IsCommit() {
ps.ensureCatchupCommitRound(votes.Height(), votes.Round(), votes.Size())
}
if ps.Height != aggVote.Height ||
(ps.Round != int(aggVote.Round) && ps.CatchupCommitRound != int(aggVote.Round)) {
return nil, false
}
if (aggVote.Type == uint32(ttypes.VoteTypePrevote) && ps.AggPrevote) ||
(aggVote.Type == uint32(ttypes.VoteTypePrecommit) && ps.AggPrecommit) {
return nil, false
}
return aggVote, true
}
// PickVoteToSend picks a vote to send to the peer.
// Returns true if a vote was picked.
// NOTE: `votes` must be the correct Size() for the Height().
......
plugin/consensus/qbft/qbft.go
View file @ d9cf7b75
......@@ -35,34 +35,33 @@ const (
var (
qbftlog = log15.New("module", "qbft")
genesis string
genesisAmount int64 = 1e8
genesisBlockTime int64
timeoutTxAvail int32 = 1000
timeoutPropose int32 = 3000 // millisecond
timeoutProposeDelta int32 = 500
timeoutPrevote int32 = 1000
timeoutPrevoteDelta int32 = 500
timeoutPrecommit int32 = 1000
timeoutPrecommitDelta int32 = 500
timeoutCommit int32 = 1000
skipTimeoutCommit = false
createEmptyBlocks = false
createEmptyBlocksInterval int32 // second
genesisFile = "genesis.json"
privFile = "priv_validator.json"
dbPath = fmt.Sprintf("datadir%sqbft", string(os.PathSeparator))
port int32 = DefaultQbftPort
validatorNodes = []string{"127.0.0.1:33001"}
fastSync = false
preExec = false
signName = "ed25519"
useAggSig = false
multiBlocks int64 = 1
genesis string
genesisAmount int64 = 1e8
genesisBlockTime int64
timeoutTxAvail atomic.Value // 1000 millisecond
timeoutPropose atomic.Value // 3000
timeoutProposeDelta atomic.Value // 500
timeoutPrevote atomic.Value // 1000
timeoutPrevoteDelta atomic.Value // 500
timeoutPrecommit atomic.Value // 1000
timeoutPrecommitDelta atomic.Value // 500
timeoutCommit atomic.Value // 1000
skipTimeoutCommit atomic.Value // false
emptyBlockInterval atomic.Value // 0 second
genesisFile = "genesis.json"
privFile = "priv_validator.json"
dbPath = fmt.Sprintf("datadir%sqbft", string(os.PathSeparator))
port int32 = DefaultQbftPort
validatorNodes = []string{"127.0.0.1:33001"}
fastSync = false
preExec atomic.Value // false
signName atomic.Value // "ed25519"
useAggSig atomic.Value // false
multiBlocks atomic.Value // 1
gossipVotes atomic.Value
zeroHash [32]byte
random *rand.Rand
gossipVotes atomic.Value
peerGossipSleepDuration int32 = 100
peerQueryMaj23SleepDuration int32 = 2000
)
......@@ -89,30 +88,29 @@ type Client struct {
}
type subConfig struct {
Genesis string `json:"genesis"`
GenesisAmount int64 `json:"genesisAmount"`
GenesisBlockTime int64 `json:"genesisBlockTime"`
TimeoutTxAvail int32 `json:"timeoutTxAvail"`
TimeoutPropose int32 `json:"timeoutPropose"`
TimeoutProposeDelta int32 `json:"timeoutProposeDelta"`
TimeoutPrevote int32 `json:"timeoutPrevote"`
TimeoutPrevoteDelta int32 `json:"timeoutPrevoteDelta"`
TimeoutPrecommit int32 `json:"timeoutPrecommit"`
TimeoutPrecommitDelta int32 `json:"timeoutPrecommitDelta"`
TimeoutCommit int32 `json:"timeoutCommit"`
SkipTimeoutCommit bool `json:"skipTimeoutCommit"`
CreateEmptyBlocks bool `json:"createEmptyBlocks"`
CreateEmptyBlocksInterval int32 `json:"createEmptyBlocksInterval"`
GenesisFile string `json:"genesisFile"`
PrivFile string `json:"privFile"`
DbPath string `json:"dbPath"`
Port int32 `json:"port"`
ValidatorNodes []string `json:"validatorNodes"`
FastSync bool `json:"fastSync"`
PreExec bool `json:"preExec"`
SignName string `json:"signName"`
UseAggregateSignature bool `json:"useAggregateSignature"`
MultiBlocks int64 `json:"multiBlocks"`
Genesis string `json:"genesis"`
GenesisAmount int64 `json:"genesisAmount"`
GenesisBlockTime int64 `json:"genesisBlockTime"`
TimeoutTxAvail int32 `json:"timeoutTxAvail"`
TimeoutPropose int32 `json:"timeoutPropose"`
TimeoutProposeDelta int32 `json:"timeoutProposeDelta"`
TimeoutPrevote int32 `json:"timeoutPrevote"`
TimeoutPrevoteDelta int32 `json:"timeoutPrevoteDelta"`
TimeoutPrecommit int32 `json:"timeoutPrecommit"`
TimeoutPrecommitDelta int32 `json:"timeoutPrecommitDelta"`
TimeoutCommit int32 `json:"timeoutCommit"`
SkipTimeoutCommit bool `json:"skipTimeoutCommit"`
EmptyBlockInterval int32 `json:"emptyBlockInterval"`
GenesisFile string `json:"genesisFile"`
PrivFile string `json:"privFile"`
DbPath string `json:"dbPath"`
Port int32 `json:"port"`
ValidatorNodes []string `json:"validatorNodes"`
FastSync bool `json:"fastSync"`
PreExec bool `json:"preExec"`
SignName string `json:"signName"`
UseAggregateSignature bool `json:"useAggregateSignature"`
MultiBlocks int64 `json:"multiBlocks"`
}
func applyConfig(sub []byte) {
......@@ -120,44 +118,20 @@ func applyConfig(sub []byte) {
if sub != nil {
types.MustDecode(sub, &subcfg)
}
if subcfg.Genesis != "" {
genesis = subcfg.Genesis
}
if subcfg.GenesisAmount > 0 {
genesisAmount = subcfg.GenesisAmount
}
if subcfg.GenesisBlockTime > 0 {
genesisBlockTime = subcfg.GenesisBlockTime
}
if subcfg.TimeoutTxAvail > 0 {
timeoutTxAvail = subcfg.TimeoutTxAvail
}
if subcfg.TimeoutPropose > 0 {
timeoutPropose = subcfg.TimeoutPropose
}
if subcfg.TimeoutProposeDelta > 0 {
timeoutProposeDelta = subcfg.TimeoutProposeDelta
}
if subcfg.TimeoutPrevote > 0 {
timeoutPrevote = subcfg.TimeoutPrevote
}
if subcfg.TimeoutPrevoteDelta > 0 {
timeoutPrevoteDelta = subcfg.TimeoutPrevoteDelta
}
if subcfg.TimeoutPrecommit > 0 {
timeoutPrecommit = subcfg.TimeoutPrecommit
}
if subcfg.TimeoutPrecommitDelta > 0 {
timeoutPrecommitDelta = subcfg.TimeoutPrecommitDelta
}
if subcfg.TimeoutCommit > 0 {
timeoutCommit = subcfg.TimeoutCommit
}
skipTimeoutCommit = subcfg.SkipTimeoutCommit
createEmptyBlocks = subcfg.CreateEmptyBlocks
if subcfg.CreateEmptyBlocksInterval > 0 {
createEmptyBlocksInterval = subcfg.CreateEmptyBlocksInterval
}
genesis = subcfg.Genesis
genesisAmount = subcfg.GenesisAmount
genesisBlockTime = subcfg.GenesisBlockTime
timeoutTxAvail.Store(subcfg.TimeoutTxAvail)
timeoutPropose.Store(subcfg.TimeoutPropose)
timeoutProposeDelta.Store(subcfg.TimeoutProposeDelta)
timeoutPrevote.Store(subcfg.TimeoutPrevote)
timeoutPrevoteDelta.Store(subcfg.TimeoutPrevoteDelta)
timeoutPrecommit.Store(subcfg.TimeoutPrecommit)
timeoutPrecommitDelta.Store(subcfg.TimeoutPrecommitDelta)
timeoutCommit.Store(subcfg.TimeoutCommit)
skipTimeoutCommit.Store(subcfg.SkipTimeoutCommit)
emptyBlockInterval.Store(subcfg.EmptyBlockInterval)
if subcfg.GenesisFile != "" {
genesisFile = subcfg.GenesisFile
}
......@@ -174,19 +148,26 @@ func applyConfig(sub []byte) {
validatorNodes = subcfg.ValidatorNodes
}
fastSync = subcfg.FastSync
preExec = subcfg.PreExec
preExec.Store(subcfg.PreExec)
signName.Store("ed25519")
if subcfg.SignName != "" {
signName = subcfg.SignName
signName.Store(subcfg.SignName)
}
useAggSig = subcfg.UseAggregateSignature
gossipVotes.Store(true)
useAggSig.Store(subcfg.UseAggregateSignature)
multiBlocks.Store(int64(1))
if subcfg.MultiBlocks > 0 {
multiBlocks = subcfg.MultiBlocks
multiBlocks.Store(subcfg.MultiBlocks)
}
gossipVotes.Store(true)
}
// UseAggSig returns whether use aggregate signature
func UseAggSig() bool {
return useAggSig.Load().(bool)
}
// DefaultDBProvider returns a database using the DBBackend and DBDir
// specified in the ctx.Config.
// DefaultDBProvider returns a database
func DefaultDBProvider(name string) dbm.DB {
return dbm.NewDB(name, "leveldb", dbPath, 0)
}
......@@ -207,7 +188,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
//init rand
ttypes.Init()
signType, ok := ttypes.SignMap[signName]
signType, ok := ttypes.SignMap[signName.Load().(string)]
if !ok {
qbftlog.Error("invalid sign name")
return nil
......@@ -221,7 +202,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
}
ttypes.ConsensusCrypto = cr
if useAggSig {
if UseAggSig() {
_, err = crypto.ToAggregate(ttypes.ConsensusCrypto)
if err != nil {
qbftlog.Error("qbft crypto not support aggregate signature", "name", ttypes.CryptoName)
......@@ -475,7 +456,7 @@ func (client *Client) ProcEvent(msg *queue.Message) bool {
// CreateBlock trigger consensus forward when tx available
func (client *Client) CreateBlock() {
ticker := time.NewTicker(time.Duration(timeoutTxAvail) * time.Millisecond)
ticker := time.NewTicker(time.Duration(timeoutTxAvail.Load().(int32)) * time.Millisecond)
defer ticker.Stop()
for {
......
plugin/consensus/qbft/state.go
View file @ d9cf7b75
......@@ -464,7 +464,7 @@ func CreateBlockInfoTx(priv crypto.PrivKey, state *tmtypes.QbftState, block *tmt
tx := &types.Transaction{Execer: []byte("qbftNode"), Payload: types.Encode(action), Fee: fee}
tx.To = address.ExecAddress("qbftNode")
tx.Nonce = random.Int63()
tx.Sign(int32(ttypes.SignMap[signName]), priv)
tx.Sign(int32(ttypes.SignMap[signName.Load().(string)]), priv)
return tx
}
plugin/consensus/qbft/types/vote_set.go
View file @ d9cf7b75
......@@ -281,8 +281,8 @@ func (voteSet *VoteSet) addVerifiedVote(vote *Vote, blockKey string, votingPower
if origSum < quorum && quorum <= votesByBlock.sum {
// Only consider the first quorum reached
if voteSet.maj23 == nil {
maj23BlockID := *vote.BlockID
voteSet.maj23 = &maj23BlockID
voteSet.maj23 = &tmtypes.QbftBlockID{Hash: make([]byte, len(vote.BlockID.Hash))}
copy(voteSet.maj23.Hash, vote.BlockID.Hash)
// And also copy votes over to voteSet.votes
for i, vote := range votesByBlock.votes {
if vote != nil {
......@@ -356,7 +356,8 @@ func (voteSet *VoteSet) AddAggVote(vote *AggVote) (bool, error) {
voteSet.votesBitArray = arr.copy()
voteSet.aggVote = vote
voteSet.maj23 = vote.BlockID
voteSet.maj23 = &tmtypes.QbftBlockID{Hash: make([]byte, len(vote.BlockID.Hash))}
copy(voteSet.maj23.Hash, vote.BlockID.Hash)
voteSet.sum = sum
votesByBlock := newBlockVotes(false, voteSet.valSet.Size())
votesByBlock.bitArray = arr.copy()
......@@ -560,14 +561,16 @@ func (voteSet *VoteSet) HasAll() bool {
// TwoThirdsMajority Returns either a blockhash (or nil) that received +2/3 majority.
// If there exists no such majority, returns (nil, PartSetHeader{}, false).
func (voteSet *VoteSet) TwoThirdsMajority() (blockID tmtypes.QbftBlockID, ok bool) {
func (voteSet *VoteSet) TwoThirdsMajority() (tmtypes.QbftBlockID, bool) {
if voteSet == nil {
return tmtypes.QbftBlockID{}, false
}
voteSet.mtx.Lock()
defer voteSet.mtx.Unlock()
if voteSet.maj23 != nil {
return *voteSet.maj23, true
blockID := tmtypes.QbftBlockID{Hash: make([]byte, len(voteSet.maj23.Hash))}
copy(blockID.Hash, voteSet.maj23.Hash)
return blockID, true
}
return tmtypes.QbftBlockID{}, false
}
......
plugin/dapp/qbftNode/commands/qbftNode.go
View file @ d9cf7b75
......@@ -316,7 +316,7 @@ func createFiles(cmd *cobra.Command, args []string) {
for i := 0; i < n; i++ {
// create private validator file
pvFileName := pvFile + strconv.Itoa(i) + ".json"
privValidator := ttypes.GenPrivValidatorImp(pvFileName)
privValidator := ttypes.LoadOrGenPrivValidatorFS(pvFileName)
if privValidator == nil {
fmt.Println("create priv_validator file fail")
break
......
plugin/dapp/ticket/executor/testdata/chain33.cfg.toml
View file @ d9cf7b75
......@@ -253,3 +253,5 @@ ForkParaAssetTransferRbk=0
#仅平行链适用，开启挖矿交易的高度，已有代码版本可能未在0高度开启挖矿，需要设置这个高度，新版本默认从0开启挖矿，通过交易配置分阶段奖励
ForkParaFullMinerHeight=0
[fork.sub.qbftNode]
Enable=0
plugin/dapp/ticket/rpc/rpc_test.go
View file @ d9cf7b75
......@@ -410,6 +410,9 @@ ForkIssuanceTableUpdate=0
Enable=0
ForkCollateralizeTableUpdate=0
[fork.sub.qbftNode]
Enable=0
#对已有的平行链如果不是从0开始同步数据，需要设置这个kvmvccmavl的对应平行链高度的fork，如果从0开始同步，statehash会跟以前mavl的不同
[fork.sub.store-kvmvccmavl]
ForkKvmvccmavl=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment