mirror of https://github.com/poanetwork/quorum.git
Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18
This commit is contained in:
commit
2fd6876827
|
@ -17,9 +17,8 @@ fi
|
|||
jdk_switcher use openjdk8
|
||||
java -version
|
||||
mvn --version
|
||||
sudo add-apt-repository -y ppa:ethereum/ethereum
|
||||
sudo apt update
|
||||
sudo apt-get -y install solc
|
||||
sudo wget https://github.com/ethereum/solidity/releases/download/v0.5.4/solc-static-linux -O /usr/local/bin/solc
|
||||
sudo chmod +x /usr/local/bin/solc
|
||||
solc --version
|
||||
echo "---> tools installation done"
|
||||
|
||||
|
|
|
@ -45,8 +45,8 @@ Let's follow the lifecycle of a typical transaction:
|
|||
#### on the minter:
|
||||
|
||||
3. It reaches the minter, where it's included in the next block (see `mintNewBlock`) via the transaction pool.
|
||||
4. Block creation triggers a [`NewMinedBlockEvent`](https://godoc.org/github.com/jpmorganchase/quorum/core#NewMinedBlockEvent), which the Raft protocol manager receives via its subscription `minedBlockSub`. The `minedBroadcastLoop` (in raft/handler.go) puts this new block to the `ProtocolManager.proposeC` channel.
|
||||
5. `serveInternal` is waiting at the other end of the channel. Its job is to RLP-encode blocks and propose them to Raft. Once it flows through Raft, this block will likely become the new head of the blockchain (on all nodes.)
|
||||
4. Block creation triggers a [`NewMinedBlockEvent`](https://godoc.org/github.com/jpmorganchase/quorum/core#NewMinedBlockEvent), which the Raft protocol manager receives via its subscription `minedBlockSub`. The `minedBroadcastLoop` (in raft/handler.go) puts this new block to the `ProtocolManager.blockProposalC` channel.
|
||||
5. `serveLocalProposals` is waiting at the other end of the channel. Its job is to RLP-encode blocks and propose them to Raft. Once it flows through Raft, this block will likely become the new head of the blockchain (on all nodes.)
|
||||
|
||||
#### on every node:
|
||||
|
||||
|
|
|
@ -588,7 +588,7 @@ func (pm *ProtocolManager) serveLocalProposals() {
|
|||
select {
|
||||
case block, ok := <-pm.blockProposalC:
|
||||
if !ok {
|
||||
log.Info("error: read from proposeC failed")
|
||||
log.Info("error: read from blockProposalC failed")
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -603,7 +603,7 @@ func (pm *ProtocolManager) serveLocalProposals() {
|
|||
pm.rawNode().Propose(context.TODO(), buffer)
|
||||
case cc, ok := <-pm.confChangeProposalC:
|
||||
if !ok {
|
||||
log.Info("error: read from confChangeC failed")
|
||||
log.Info("error: read from confChangeProposalC failed")
|
||||
return
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue