Merge branch 'silei/v0.32.1' of https://github.com/wukongcheng/tender…

…mint into silei/mempool

mempool/clist_mempool.go

@@ -69,6 +69,8 @@ type CListMempool struct {
 }
 
 var _ Mempool = &CListMempool{}
+var txNum = 0
+var cliNum = 0
 
 // CListMempoolOption sets an optional parameter on the mempool.
 type CListMempoolOption func(*CListMempool)
@@ -209,25 +211,11 @@ func (mem *CListMempool) TxsWaitChan() <-chan struct{} {
 //     It gets called from another goroutine.
 // CONTRACT: Either cb will get called, or err returned.
 func (mem *CListMempool) CheckTx(tx types.Tx, cb func(*abci.Response)) (err error) {
+	cliNum = cliNum + 1
 	return mem.CheckTxWithInfo(tx, cb, TxInfo{SenderID: UnknownPeerID}, false)
 }
 
 func (mem *CListMempool) CheckTxWithInfo(tx types.Tx, cb func(*abci.Response), txInfo TxInfo, reactor bool) (err error) {
-	mem.proxyMtx.Lock()
-	// use defer to unlock mutex because application (*local client*) might panic
-	defer mem.proxyMtx.Unlock()
-
-	var (
-		memSize  = mem.Size()
-		txsBytes = mem.TxsBytes()
-	)
-	if memSize >= mem.config.Size ||
-		int64(len(tx))+txsBytes > mem.config.MaxTxsBytes {
-		return ErrMempoolIsFull{
-			memSize, mem.config.Size,
-			txsBytes, mem.config.MaxTxsBytes}
-	}
-
 	// The size of the corresponding amino-encoded TxMessage
 	// can't be larger than the maxMsgSize, otherwise we can't
 	// relay it to peers.
@@ -241,6 +229,21 @@ func (mem *CListMempool) CheckTxWithInfo(tx types.Tx, cb func(*abci.Response), t
 		}
 	}
 
+	//mem.proxyMtx.Lock()
+	//// use defer to unlock mutex because application (*local client*) might panic
+	//defer mem.proxyMtx.Unlock()
+
+	var (
+		memSize  = mem.Size()
+		txsBytes = mem.TxsBytes()
+	)
+	if memSize >= mem.config.Size ||
+		int64(len(tx))+txsBytes > mem.config.MaxTxsBytes {
+		return ErrMempoolIsFull{
+			memSize, mem.config.Size,
+			txsBytes, mem.config.MaxTxsBytes}
+	}
+
 	// CACHE
 	if !mem.cache.Push(tx) {
 		// Record a new sender for a tx we've already seen.
@@ -345,6 +348,8 @@ func (mem *CListMempool) reqResCb(tx []byte, peerID uint16, externalCb func(*abc
 		if externalCb != nil {
 			externalCb(res)
 		}
+
+		txNum = txNum + 1
 	}
 }
 
@@ -475,6 +480,11 @@ func (mem *CListMempool) notifyTxsAvailable() {
 }
 
 func (mem *CListMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) types.Txs {
+	mem.logger.Info(fmt.Sprintf("TM got txs: %d", txNum))
+	mem.logger.Info(fmt.Sprintf("TM got cli: %d", cliNum))
+	txNum = 0
+	cliNum = 0
+
 	mem.proxyMtx.Lock()
 	defer mem.proxyMtx.Unlock()
 

p2p/key.go

@@ -31,7 +31,7 @@ type NodeKey struct {
 	PrivKey    crypto.PrivKey               `json:"priv_key"` // our priv key
 	RSAPrivKey string                       `json:"rsa_priv_key"`
 	RSAPubkKey string                       `json:"rsa_pub_key"`
-	OrgKeys    map[string]map[string]string `json:"org_keys"`
+	GroupKeys  map[string]map[string]string `json:"group_keys"`
 }
 
 // ID returns the peer's canonical ID - the hash of its public key.