diff --git a/README.md b/README.md
index 29f621811e..8997df3b5c 100644
--- a/README.md
+++ b/README.md
@@ -1,104 +1,20 @@
-# 
+QBFT Normal round (At system level)
-
-[](https://hub.docker.com/r/quorumengineering/quorum)
-[](https://discord.com/channels/697535391594446898/747810572937986240)
+1. Propose: The primary node proposes a new block and starts a timer. It sends a Pre-prepare message containing the block, current round number, and sequence number to all validators.
+2. Pre-prepare: Validators receive the message. If valid, they store it and broadcast a Prepare message to all nodes, containing the current round number, sequence number, and block hash.
+3. Prepare: Validators wait for Quorum (2N/3) valid Prepare messages, including their own. If received within a timer limit, they move to the next step.
+4. Commit: Validators send a Commit message containing the current round number, sequence number, and block hash to all nodes.
+5. Finalize: After receiving Quorum (2N/3) valid Commit messages, the block is finalized and added to the blockchain. The timer is reset.
+ Timeout: If the timer expires at any point before finalization, validators increment the round number and proposer changes
-GoQuorum is an Ethereum-based distributed ledger protocol with transaction/contract privacy and new consensus mechanisms.
-GoQuorum is a fork of [go-ethereum](https://github.com/ethereum/go-ethereum) and is updated in line with go-ethereum releases.
+Round change (Node level)
-Key enhancements over go-ethereum:
+1. Timer expiry triggers round changes message broadcast with current+1 round, any prepared round and corresponding value
+2. At any time, if f+1 RC messages are received with round number higher than current , all valid, reset timer and set round number to min of those higher values, broadcast RC with the new round number and any prepared round - no justification needed here
+3. Quorum of round change messages received for a round for which this node is proposer, and round change is justified, set value to highest prepared of this quorum if it exists or to input value.
+4. Round change is justified if all RC messages have no PR and PV set or if there's a highest prepared round, that PR and PV should have corresponding Quorum of prepare messages
-* [__Privacy__](https://consensys.net/docs/goquorum//en/latest/concepts/privacy/privacy/) - GoQuorum supports private transactions and private contracts through public/private state separation, and utilises peer-to-peer encrypted message exchanges (see [Tessera](https://github.com/consensys/tessera)) for directed transfer of private data to network participants
-* [__Alternative Consensus Mechanisms__](https://consensys.net/docs/goquorum//en/latest/concepts/consensus/overview/) - with no need for POW/POS in a permissioned network, GoQuorum instead offers multiple consensus mechanisms that are more appropriate for consortium chains:
- * [__QBFT__](https://consensys.net/docs/goquorum/en/latest/configure-and-manage/configure/consensus-protocols/qbft/) - Improved version of IBFT that is interoperable with Hyperledger Besu
- * [__Istanbul BFT__](https://consensys.net/docs/goquorum/en/latest/configure-and-manage/configure/consensus-protocols/ibft/) - a PBFT-inspired consensus algorithm with transaction finality, by AMIS.
- * [__Clique POA Consensus__](https://github.com/ethereum/EIPs/issues/225) - a default POA consensus algorithm bundled with Go Ethereum.
- * [__Raft-based Consensus__](https://consensys.net/docs/goquorum/en/latest/configure-and-manage/configure/consensus-protocols/raft/) - a consensus model for faster blocktimes, transaction finality, and on-demand block creation
-* [__Peer Permissioning__](https://consensys.net/docs/goquorum/en/latest/concepts/permissions-overview/) - node/peer permissioning, ensuring only known parties can join the network
-* [__Account Management__](https://consensys.net/docs/goquorum/en/latest/concepts/account-management/) - GoQuorum introduced account plugins, which allows GoQuorum or clef to be extended with alternative methods of managing accounts including external vaults.
-* [__Pluggable Architecture__](https://consensys.net/docs/goquorum/en/latest/concepts/plugins/) - allows adding additional features as plugins to the core `geth`, providing extensibility, flexibility, and distinct isolation of GoQuorum features.
-* __Higher Performance__ - GoQuorum offers significantly higher performance throughput than public geth
-
-## Architecture
-
-
-
-The above diagram is very high-level overview of component architecture used by GoQuorum. For more in-depth discussion of the components and how they interact, please refer to [lifecycle of a private transaction](https://consensys.net/docs/goquorum/en/latest/concepts/privacy/private-transaction-lifecycle/).
-
-## Quickstart
-The easiest way to get started is to use * [quorum-dev-quickstart](https://consensys.net/docs/goquorum/en/latest/tutorials/quorum-dev-quickstart/using-the-quickstart/) - a command line tool that allows users to set up a development GoQuorum network on their local machine in less than *2 minutes*.
-
-## GoQuorum Projects
-
-Check out some of the interesting projects we are actively working on:
-
-* [quorum-remix-plugin](https://consensys.net/docs/goquorum/en/latest/tutorials/quorum-dev-quickstart/remix/): The GoQuorum plugin for Ethereum's Remix IDE adds support for creating and interacting with private contracts on a GoQuorum network.
-* [Cakeshop](https://consensys.net/docs/goquorum/en/latest/configure-and-manage/monitor/cakeshop/): An integrated development environment and SDK for GoQuorum
-* [quorum-examples](https://github.com/ConsenSys/quorum-examples): GoQuorum demonstration examples
-* 
[Quorum-Kubernetes](https://consensys.net/docs/goquorum/en/latest/deploy/install/kubernetes/): Deploy GoQuorum on Kubernetes
-* [we3js-quorum](https://consensys.net/docs/goquorum/en/latest/reference/web3js-quorum/): Extends web3.js to support GoQuorum and Hyperledger Besu specific APIs
-* Zero Knowledge on GoQuorum
- * [ZSL on GoQuorum](https://github.com/ConsenSys/zsl-q/)
- * [Anonymous Zether](https://github.com/ConsenSys/anonymous-zether)
-
-
-
-## Official Docker Containers
-The official docker containers can be found under https://hub.docker.com/u/quorumengineering/
-
-## Third Party Tools/Libraries
-
-The following GoQuorum-related libraries/applications have been created by Third Parties and as such are not specifically endorsed by J.P. Morgan. A big thanks to the developers for improving the tooling around GoQuorum!
-
-* [Chainlens Blockchain Explorer](https://github.com/web3labs/chainlens-free) - a Blockchain Explorer for GoQuorum which supports viewing private transactions
-* [Quorum-Genesis](https://github.com/davebryson/quorum-genesis) - A simple CL utility for GoQuorum to help populate the genesis file with voters and makers
-* [Quorum Maker](https://github.com/synechron-finlabs/quorum-maker/) - a utility to create GoQuorum nodes
-* [ERC20 REST service](https://github.com/web3labs/erc20-rest-service) - a GoQuorum-supported RESTful service for creating and managing ERC-20 tokens
-* [Nethereum Quorum](https://github.com/Nethereum/Nethereum/tree/master/src/Nethereum.Quorum) - a .NET GoQuorum adapter
-* [web3j-quorum](https://github.com/web3j/web3j-quorum) - an extension to the web3j Java library providing support for the GoQuorum API
-* [Apache Camel](http://github.com/apache/camel) - an Apache Camel component providing support for the GoQuorum API using web3j library. Here is the artcile describing how to use Apache Camel with Ethereum and GoQuorum https://medium.com/@bibryam/enterprise-integration-for-ethereum-fa67a1577d43
-
-## Contributing
-GoQuorum is built on open source and we invite you to contribute enhancements. Upon review you will be required to complete a Contributor License Agreement (CLA) before we are able to merge. If you have any questions about the contribution process, please feel free to send an email to [info@goquorum.com](mailto:info@goquorum.com). Please see the [Contributors guide](.github/CONTRIBUTING.md) for more information about the process.
-
-## Reporting Security Bugs
-Security is part of our commitment to our users. At GoQuorum we have a close relationship with the security community, we understand the realm, and encourage security researchers to become part of our mission of building secure reliable software. This section explains how to submit security bugs, and what to expect in return.
-
-All security bugs in [GoQuorum](https://github.com/consensys/quorum) and its ecosystem ([Tessera](https://github.com/consensys/tessera), [Cakeshop](https://github.com/consensys/cakeshop), ..etc) should be reported by email to [security-quorum@consensys.net](mailto:security-quorum@consensys.net). Please use the prefix **[security]** in your subject. This email is delivered to GoQuorum security team. Your email will be acknowledged, and you'll receive a more detailed response to your email as soon as possible indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress being made towards a fix and full announcement.
-
-If you have not received a reply to your email or you have not heard from the security team please contact any team member through GoQuorum slack security channel. **Please note that GoQuorum discord channels are public discussion forum**. When escalating to this medium, please do not disclose the details of the issue. Simply state that you're trying to reach a member of the security team.
-
-#### Responsible Disclosure Process
-GoQuorum project uses the following responsible disclosure process:
-
-- Once the security report is received it is assigned a primary handler. This person coordinates the fix and release process.
-- The issue is confirmed and a list of affected software is determined.
-- Code is audited to find any potential similar problems.
-- If it is determined, in consultation with the submitter, that a CVE-ID is required, the primary handler will trigger the process.
-- Fixes are applied to the public repository and a new release is issued.
-- On the date that the fixes are applied, announcements are sent to Quorum-announce.
-- At this point you would be able to disclose publicly your finding.
-
-**Note:** This process can take some time. Every effort will be made to handle the security bug in as timely a manner as possible, however it's important that we follow the process described above to ensure that disclosures are handled consistently.
-
-#### Receiving Security Updates
-The best way to receive security announcements is to subscribe to the Quorum-announce mailing list/channel. Any messages pertaining to a security issue will be prefixed with **[security]**.
-
-Comments on This Policy
-If you have any suggestions to improve this policy, please send an email to info@goquorum.com for discussion.
-
-## License
-
-The go-ethereum library (i.e. all code outside of the `cmd` directory) is licensed under the
-[GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html), also
-included in our repository in the `COPYING.LESSER` file.
-
-The go-ethereum binaries (i.e. all code inside of the `cmd` directory) is licensed under the
-[GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), also included
-in our repository in the `COPYING` file.
-
-Any project planning to use the `crypto/secp256k1` sub-module must use the specific [secp256k1 standalone library](https://github.com/ConsenSys/goquorum-crypto-secp256k1) licensed under 3-clause BSD.
\ No newline at end of file
+preprepare justification - first round or after a round change
diff --git a/consensus/istanbul/qbft/core/commit.go b/consensus/istanbul/qbft/core/commit.go
index 3dce6c36e0..946e7ec9be 100644
--- a/consensus/istanbul/qbft/core/commit.go
+++ b/consensus/istanbul/qbft/core/commit.go
@@ -88,6 +88,8 @@ func (c *core) broadcastCommit() {
func (c *core) handleCommitMsg(commit *qbfttypes.Commit) error {
logger := c.currentLogger(true, commit)
+ logger.Warn("BP: commit.go:handleCommitMsg : get quorum of valid commit messages, stop timer and commit")
+
logger.Info("QBFT: handle COMMIT message", "commits.count", c.current.QBFTCommits.Size(), "quorum", c.QuorumSize())
// Check digest
@@ -135,6 +137,7 @@ func (c *core) commitQBFT() {
// Commit proposal to database
if err := c.backend.Commit(proposal, committedSeals, c.currentView().Round); err != nil {
c.currentLogger(true, nil).Error("QBFT: error committing proposal", "err", err)
+ c.currentLogger(true, nil).Warn("BP: commit.go:handleCommitMsg : commit failed, broadcasting round change msgs")
c.broadcastNextRoundChange()
return
}
diff --git a/consensus/istanbul/qbft/core/core.go b/consensus/istanbul/qbft/core/core.go
index 39e6043ce0..ba0d3c9042 100644
--- a/consensus/istanbul/qbft/core/core.go
+++ b/consensus/istanbul/qbft/core/core.go
@@ -138,6 +138,10 @@ func (c *core) startNewRound(round *big.Int) {
logger.Info("QBFT: initialize new round")
+ logger.Warn("BP: Core.go:startNewRound - Starting a new round ")
+
+ logger.Warn("BP: Core.go:startNewRound - check proposal number, sequence number order ")
+
if c.current == nil {
logger.Debug("QBFT: start at the initial round")
} else if lastProposal.Number().Cmp(c.current.Sequence()) >= 0 {
@@ -189,6 +193,7 @@ func (c *core) startNewRound(round *big.Int) {
// New snapshot for new round
c.updateRoundState(newView, c.valSet, roundChange)
+ logger.Warn("BP: Core.go:startNewRound - reset state and figure out proposer")
// Calculate new proposer
c.valSet.CalcProposer(lastProposer, newView.Round.Uint64())
c.setState(StateAcceptRequest)
@@ -196,7 +201,7 @@ func (c *core) startNewRound(round *big.Int) {
if c.current != nil && round.Cmp(c.current.Round()) > 0 {
roundMeter.Mark(new(big.Int).Sub(round, c.current.Round()).Int64())
}
-
+ logger.Warn("BP: Core.go:startNewRound - Do not touch preparedPrepares for round changes , clear for new sequence ")
// Update RoundChangeSet by deleting older round messages
if round.Uint64() == 0 {
c.QBFTPreparedPrepares = nil
diff --git a/consensus/istanbul/qbft/core/handler.go b/consensus/istanbul/qbft/core/handler.go
index e77f7087ae..f1ac5eb980 100644
--- a/consensus/istanbul/qbft/core/handler.go
+++ b/consensus/istanbul/qbft/core/handler.go
@@ -228,6 +228,8 @@ func (c *core) handleTimeoutMsg() {
round := c.current.Round()
nextRound := new(big.Int).Add(round, common.Big1)
+ logger.Warn("BP: handler.go:handleTimeoutMsg : timeout happened, starting new round and BCing round change msg")
+
logger.Warn("QBFT: TIMER CHANGING ROUND", "pr", c.current.preparedRound)
c.startNewRound(nextRound)
logger.Warn("QBFT: TIMER CHANGED ROUND", "pr", c.current.preparedRound)
diff --git a/consensus/istanbul/qbft/core/justification.go b/consensus/istanbul/qbft/core/justification.go
index 35631c002f..a6298ed0e8 100644
--- a/consensus/istanbul/qbft/core/justification.go
+++ b/consensus/istanbul/qbft/core/justification.go
@@ -42,6 +42,7 @@ func isJustified(
}
}
}
+ log.Warn("BP: justification.go:isJustified - All the prepare messages match round of proposal")
if preparedRound == nil {
return hasQuorumOfRoundChangeMessagesForNil(roundChangeMessages, quorumSize)
@@ -53,12 +54,14 @@ func isJustified(
// Checks whether a set of ROUND-CHANGE messages has `quorumSize` messages with nil prepared round and
// prepared block.
func hasQuorumOfRoundChangeMessagesForNil(roundChangeMessages []*qbfttypes.SignedRoundChangePayload, quorumSize int) error {
+ log.Warn("BP: justification.go:isJustified - Checking for a quorum of RC messages without prepared round")
nilCount := 0
for _, m := range roundChangeMessages {
log.Trace("QBFT: hasQuorumOfRoundChangeMessagesForNil", "rc", m)
if (m.PreparedRound == nil || m.PreparedRound.Cmp(common.Big0) == 0) && common.EmptyHash(m.PreparedDigest) {
nilCount++
if nilCount == quorumSize {
+ log.Warn("BP: justification.go:hasQuorumOfRoundChangeMessagesForNil - Found a quorum of RC messages without prepared round")
return nil
}
}
@@ -71,6 +74,7 @@ func hasQuorumOfRoundChangeMessagesForNil(roundChangeMessages []*qbfttypes.Signe
func hasQuorumOfRoundChangeMessagesForPreparedRoundAndBlock(roundChangeMessages []*qbfttypes.SignedRoundChangePayload, preparedRound *big.Int, preparedBlock istanbul.Proposal, quorumSize int) error {
lowerOrEqualRoundCount := 0
hasMatchingMessage := false
+ log.Warn("BP: justification.go:hasQuorumOfRoundChangeMessagesForPreparedRoundAndBlock - check if the highest prepared round of RC messages have prepared messages quorum")
for _, m := range roundChangeMessages {
log.Trace("QBFT: hasQuorumOfRoundChangeMessagesForPreparedRoundAndBlock", "rc", m)
if m.PreparedRound == nil || m.PreparedRound.Cmp(preparedRound) <= 0 {
diff --git a/consensus/istanbul/qbft/core/prepare.go b/consensus/istanbul/qbft/core/prepare.go
index 1ee6edfe15..aa60096092 100644
--- a/consensus/istanbul/qbft/core/prepare.go
+++ b/consensus/istanbul/qbft/core/prepare.go
@@ -55,6 +55,8 @@ func (c *core) broadcastPrepare() {
return
}
+ logger.Warn("BP: Prepare.go:broadcastPrepare straightforward create prepare message, sign, encode and broadcast!")
+
withMsg(logger, prepare).Info("QBFT: broadcast PREPARE message", "payload", hexutil.Encode(payload))
// Broadcast RLP-encoded message
@@ -62,6 +64,7 @@ func (c *core) broadcastPrepare() {
withMsg(logger, prepare).Error("QBFT: failed to broadcast PREPARE message", "err", err)
return
}
+
}
// handlePrepare is called when receiving a PREPARE message
@@ -75,6 +78,8 @@ func (c *core) handlePrepare(prepare *qbfttypes.Prepare) error {
logger.Info("QBFT: handle PREPARE message", "prepares.count", c.current.QBFTPrepares.Size(), "quorum", c.QuorumSize())
+ logger.Warn("BP: Prepare.go:handlePrepare : validate and keep adding to a set till quorum is reached!")
+
// Check digest
if prepare.Digest != c.current.Proposal().Hash() {
logger.Error("QBFT: invalid PREPARE message digest")
@@ -94,6 +99,8 @@ func (c *core) handlePrepare(prepare *qbfttypes.Prepare) error {
if (c.current.QBFTPrepares.Size() >= c.QuorumSize()) && c.state.Cmp(StatePrepared) < 0 {
logger.Info("QBFT: received quorum of PREPARE messages")
+ logger.Warn("BP: Prepare.go:handlePrepare : quorum achieved, group and save these prepare messages to use for round change justification")
+
// Accumulates PREPARE messages
c.current.preparedRound = c.currentView().Round
c.QBFTPreparedPrepares = make([]*qbfttypes.Prepare, 0)
@@ -108,7 +115,7 @@ func (c *core) handlePrepare(prepare *qbfttypes.Prepare) error {
logger.Debug("QBFT: PREPARE message matches proposal", "proposal", c.current.Proposal().Hash(), "prepare", prepare.Digest)
c.current.preparedBlock = c.current.Proposal()
}
-
+ logger.Warn("BP: Prepare.go:handlePrepare :Broadcast commit message")
c.setState(StatePrepared)
c.broadcastCommit()
} else {
diff --git a/consensus/istanbul/qbft/core/preprepare.go b/consensus/istanbul/qbft/core/preprepare.go
index 098a37c417..c709079be8 100644
--- a/consensus/istanbul/qbft/core/preprepare.go
+++ b/consensus/istanbul/qbft/core/preprepare.go
@@ -41,6 +41,8 @@ func (c *core) sendPreprepareMsg(request *Request) {
logger := c.currentLogger(true, nil)
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - Called from normal handle request path and round change path)")
+
// If I'm the proposer and I have the same sequence with the proposal
if c.current.Sequence().Cmp(request.Proposal.Number()) == 0 && c.IsProposer() {
// Creates PRE-PREPARE message
@@ -48,6 +50,9 @@ func (c *core) sendPreprepareMsg(request *Request) {
preprepare := qbfttypes.NewPreprepare(curView.Sequence, curView.Round, request.Proposal)
preprepare.SetSource(c.Address())
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - check block number validity, if this node is proposer)")
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - build a preprepare message with sequence number, round number, proposed value - block contents)")
+
// Sign payload
encodedPayload, err := preprepare.EncodePayloadForSigning()
if err != nil {
@@ -61,6 +66,8 @@ func (c *core) sendPreprepareMsg(request *Request) {
}
preprepare.SetSignature(signature)
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - Encode and sign the message)")
+
// Extend PRE-PREPARE message with ROUND-CHANGE justification
if request.RCMessages != nil {
preprepare.JustificationRoundChanges = make([]*qbfttypes.SignedRoundChangePayload, 0)
@@ -69,12 +76,15 @@ func (c *core) sendPreprepareMsg(request *Request) {
withMsg(logger, preprepare).Trace("QBFT: add ROUND-CHANGE justification", "rc", m.(*qbfttypes.RoundChange).SignedRoundChangePayload)
}
withMsg(logger, preprepare).Trace("QBFT: extended PRE-PREPARE message with ROUND-CHANGE justifications", "justifications", preprepare.JustificationRoundChanges)
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - Add round change messages to the preprepare message if required - other validators check on receipt)")
+
}
// Extend PRE-PREPARE message with PREPARE justification
if request.PrepareMessages != nil {
preprepare.JustificationPrepares = request.PrepareMessages
withMsg(logger, preprepare).Trace("QBFT: extended PRE-PREPARE message with PREPARE justification", "justification", preprepare.JustificationPrepares)
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - Adding more prepare messages info)")
}
// RLP-encode message
@@ -94,6 +104,8 @@ func (c *core) sendPreprepareMsg(request *Request) {
return
}
+ logger.Warn("BP: Preprepare.go:sendPreprepareMsg - broadcast message)")
+
// Set the preprepareSent to the current round
c.current.preprepareSent = curView.Round
}
@@ -112,6 +124,8 @@ func (c *core) handlePreprepareMsg(preprepare *qbfttypes.Preprepare) error {
c.logger.Info("QBFT: handle PRE-PREPARE message")
+ logger.Warn("BP: Preprepare.go:handlePreprepareMsg - check if sender is the proposer for this round)")
+
// Validates PRE-PREPARE message comes from current proposer
if !c.valSet.IsProposer(preprepare.Source()) {
logger.Warn("QBFT: ignore PRE-PREPARE message from non proposer", "proposer", c.valSet.GetProposer().Address())
@@ -124,8 +138,11 @@ func (c *core) handlePreprepareMsg(preprepare *qbfttypes.Preprepare) error {
logger.Warn("QBFT: invalid PRE-PREPARE message justification", "err", err)
return errInvalidPreparedBlock
}
- }
+ logger.Warn("BP: Preprepare.go:handlePreprepareMsg - Msg received not in first round. Check attached info to the message if this is justified)")
+ logger.Warn("BP: Preprepare.go:handlePreprepareMsg - RC and other messages received from the sender looked at for justification?)")
+ }
+ logger.Warn("BP: Preprepare.go:handlePreprepareMsg - Block value, etc are now validated in the backend)")
// Validates PRE-PREPARE block proposal we received
if duration, err := c.backend.Verify(preprepare.Proposal); err != nil {
// if it's a future block, we will handle it again after the duration
@@ -152,6 +169,8 @@ func (c *core) handlePreprepareMsg(preprepare *qbfttypes.Preprepare) error {
if c.state == StateAcceptRequest {
c.logger.Info("QBFT: accepted PRE-PREPARE message")
+ logger.Warn("BP: Preprepare.go:handlePreprepareMsg - Accepted the received preprepare msg, start timer and broadcast prepare messages)")
+
// Re-initialize ROUND-CHANGE timer
c.newRoundChangeTimer()
c.consensusTimestamp = time.Now()
diff --git a/consensus/istanbul/qbft/core/request.go b/consensus/istanbul/qbft/core/request.go
index 0d9d5df1c0..ebee5c2aa1 100644
--- a/consensus/istanbul/qbft/core/request.go
+++ b/consensus/istanbul/qbft/core/request.go
@@ -35,6 +35,9 @@ func (c *core) handleRequest(request *Request) error {
logger.Info("QBFT: handle block proposal request")
+ logger.Warn("BP: Request.go:handleRequest - requests published as events get picked up and start consensus process for a block")
+ logger.Warn("BP: Request.go:handleRequest - This node is proposer for this round")
+
if err := c.checkRequestMsg(request); err != nil {
if err == errInvalidMessage {
logger.Error("QBFT: invalid request")
@@ -46,6 +49,7 @@ func (c *core) handleRequest(request *Request) error {
c.current.pendingRequest = request
if c.state == StateAcceptRequest {
+ logger.Warn("BP: Request.go:handleRequest - verify the state of consensus process - it is in accept request state")
config := c.config.GetConfig(c.current.Sequence())
if config.EmptyBlockPeriod == 0 { // emptyBlockPeriod is not set
// Start ROUND-CHANGE timer
@@ -96,6 +100,8 @@ func (c *core) handleRequest(request *Request) error {
}
}
}
+ logger.Warn("BP: Request.go:handleRequest - check and handle couple of empty block period cases , start round change timer(new timer for normal rounds)")
+ logger.Warn("BP: Request.go:handleRequest - Call sendPreprepareMsg, which will build the message, sign it and broadcast it)")
return nil
}
@@ -138,6 +144,8 @@ func (c *core) processPendingRequests() {
logger := c.currentLogger(true, nil)
logger.Debug("QBFT: lookup for pending block proposal requests")
+ logger.Warn("Request.go - processPendingRequests - Check for pending requests on state changes to verify and pick next block to propose")
+
for !(c.pendingRequests.Empty()) {
m, prio := c.pendingRequests.Pop()
r, ok := m.(*Request)
@@ -158,6 +166,7 @@ func (c *core) processPendingRequests() {
}
logger.Debug("QBFT: found pending block proposal request", "proposal.number", r.Proposal.Number(), "proposal.hash", r.Proposal.Hash())
+ logger.Warn("BP: Request.go:processPendingRequests - Once a block is verified and selected, publish an event with the block in proposal ")
go c.sendEvent(istanbul.RequestEvent{
Proposal: r.Proposal,
})
diff --git a/consensus/istanbul/qbft/core/roundchange.go b/consensus/istanbul/qbft/core/roundchange.go
index a2a77f8ecd..2035ea14cd 100644
--- a/consensus/istanbul/qbft/core/roundchange.go
+++ b/consensus/istanbul/qbft/core/roundchange.go
@@ -33,6 +33,7 @@ import (
// broadcastNextRoundChange sends the ROUND CHANGE message with current round + 1
func (c *core) broadcastNextRoundChange() {
+ c.currentLogger(true, nil).Warn("BP: roundchange.go:broadcastRoundChange - broadcast round change with current+1 round ")
cv := c.currentView()
c.broadcastRoundChange(new(big.Int).Add(cv.Round, common.Big1))
}
@@ -46,7 +47,7 @@ func (c *core) broadcastNextRoundChange() {
// - broadcast the ROUND-CHANGE message with the given round
func (c *core) broadcastRoundChange(round *big.Int) {
logger := c.currentLogger(true, nil)
-
+ logger.Warn("BP: roundchange.go:broadcastRoundChange - broadcast round change with current round ")
// Validates new round corresponds to current view
cv := c.currentView()
if cv.Round.Cmp(round) > 0 {
@@ -100,6 +101,8 @@ func (c *core) handleRoundChange(roundChange *qbfttypes.RoundChange) error {
view := roundChange.View()
currentRound := c.currentView().Round
+ logger.Warn("BP: roundchange.go:handleRoundChange - keep track of number of validators sending messages received for 1)current round 2)a higher round ")
+
// number of validators we received ROUND-CHANGE from for a round higher than the current one
num := c.roundChangeSet.higherRoundMessages(currentRound)
@@ -136,6 +139,8 @@ func (c *core) handleRoundChange(roundChange *qbfttypes.RoundChange) error {
if num == c.valSet.F()+1 {
// We received F+1 ROUND-CHANGE messages (this may happen before our timeout exprired)
// we start new round and broadcast ROUND-CHANGE message
+ logger.Warn("BP: roundchange.go:handleRoundChange - received RC messages from F+1 validators for higher round")
+ logger.Warn("BP: roundchange.go:handleRoundChange - start and broadcast new round change with minimum of these higher rounds")
newRound := c.roundChangeSet.getMinRoundChange(currentRound)
logger.Info("QBFT: received F+1 ROUND-CHANGE messages", "F", c.valSet.F())
@@ -150,6 +155,8 @@ func (c *core) handleRoundChange(roundChange *qbfttypes.RoundChange) error {
// If we have received a quorum of PREPARE message
// then we propose the same block proposal again if not we
// propose the block proposal that we generated
+
+ logger.Warn("BP: roundchange.go:handleRoundChange - this node is proposer, Quorum for current round RC messages - use highest prepared value with preprepare message")
_, proposal := c.highestPrepared(currentRound)
if proposal == nil {
if c.current != nil && c.current.pendingRequest != nil {
@@ -160,6 +167,8 @@ func (c *core) handleRoundChange(roundChange *qbfttypes.RoundChange) error {
}
}
+ logger.Warn("BP: roundchange.go:handleRoundChange - justify RC, prepared round and value shouldn't be set in all messages in Quorum")
+ logger.Warn("BP: roundchange.go:handleRoundChange - or the highest prepared round of RC messages should have prepared messages quorum")
// Prepare justification for ROUND-CHANGE messages
roundChangeMessages := c.roundChangeSet.roundChanges[currentRound.Uint64()]
rcSignedPayloads := make([]*qbfttypes.SignedRoundChangePayload, 0)