Merge branch 'master' into fix-raft-applied-index-out-of-range

Author: zzy96

core/tx_pool.go

@@ -1323,3 +1323,8 @@ func checkAccount(fromAcct common.Address, toAcct *common.Address) error {
 	}
 	return nil
 }
+
+// helper function to return chainHeadChannel size
+func GetChainHeadChannleSize() int {
+	return chainHeadChanSize
+}

docs/Cakeshop/Getting started.md

@@ -66,7 +66,6 @@ NOTE: you can use the Attach mode and/or Multi-Instance setup configuration to r
     ```
 2. Navigate to path/to/cakeshop/war/data/local
 3. Make the following edits to the application.properties file:
-  * set `geth.url` to the `rpcport` of your ethereum node, i.e. if your geth `rpcport` is 22001 then `geth.url=http\://localhost\:22001`
   * ensure `geth.auto.start` is set to `false`
   * ensure `geth.auto.stop` is set to `false`
 4. Run:
@@ -75,6 +74,9 @@ NOTE: you can use the Attach mode and/or Multi-Instance setup configuration to r
     $ java -jar cakeshop.war 
     ```
 5. Open **http://localhost:8080/** in your browser (Firefox/Chrome supported)
+6. The dropdown menu on the top right of the page should show "Manage Nodes" if you haven't attached to any yet. Click on that to go to the Manage Nodes page.
+7. Click Add Node and input the RPC url of your Quorum node (i.e. http://localhost:22000) and the path to the Tessera P2P Party Info endpoint (i.e. http://localhost:9001/partyinfo).
+8. Once added, click on View to attach to the node and return to the main Cakeshop page
 
 ### Multi-Instance Setup
 

docs/Security/Framework/Quorum Network Security/Node.md

@@ -45,7 +45,7 @@ preserve the Private key from compromise. In Ethereum Accounts Private keys are
 
 !!! success "Enable Quorum Enterprise JSON-RPC authorization model to enforce atomic access controls to ledger modules functionalities (e.g personal.OpenWallet)."
 
-!!! success "Implement a robust Patch Management Prgoram, and always keep the client updated to latest stable version."
+!!! success "Implement a robust Patch Management Program, and always keep the client updated to latest stable version."
 
 !!! success "Ensure Quorum client run configuration is not started with unlocked accounts options."
 
@@ -61,4 +61,4 @@ preserve the Private key from compromise. In Ethereum Accounts Private keys are
 
 !!! success "Accounts Private Key encryption password should never be stored in the ledger host in any form."
 
-!!! success "In an architecture where accounts private keys are not offloaded to ledger node clients, the encrypted private keys should be backed-up to secure environment regularly. "
+!!! success "In an architecture where accounts private keys are not offloaded to ledger node clients, the encrypted private keys should be backed-up to secure environment regularly. "

raft/handler.go

@@ -110,7 +110,7 @@ func NewProtocolManager(raftId uint16, raftPort uint16, blockchain *core.BlockCh
 		joinExisting:        joinExisting,
 		blockchain:          blockchain,
 		eventMux:            mux,
-		blockProposalC:      make(chan *types.Block),
+		blockProposalC:      make(chan *types.Block, 10),
 		confChangeProposalC: make(chan raftpb.ConfChange),
 		httpstopc:           make(chan struct{}),
 		httpdonec:           make(chan struct{}),

raft/minter.go

@@ -89,7 +89,7 @@ func newMinter(config *params.ChainConfig, eth *RaftService, blockTime time.Dura
 		speculativeChain: newSpeculativeChain(),
 
 		invalidRaftOrderingChan: make(chan InvalidRaftOrdering, 1),
-		chainHeadChan:           make(chan core.ChainHeadEvent, 1),
+		chainHeadChan:           make(chan core.ChainHeadEvent, core.GetChainHeadChannleSize()),
 		txPreChan:               make(chan core.NewTxsEvent, 4096),
 	}
 
@@ -213,7 +213,7 @@ func throttle(rate time.Duration, f func()) func() {
 
 		for range ticker.C {
 			<-request.Out()
-			go f()
+			f()
 		}
 	}()