Merge remote-tracking branch 'origin/master' into main/libp2p

This commit is contained in:
tycho garen
2022-05-23 08:32:12 -04:00
65 changed files with 2845 additions and 614 deletions

View File

@@ -266,7 +266,7 @@ func makeNode(
node.evPool = evPool
mpReactor, mp := createMempoolReactor(logger, cfg, proxyApp, stateStore, nodeMetrics.mempool,
peerManager.Subscribe, node.router.OpenChannel, peerManager.GetHeight)
peerManager.Subscribe, node.router.OpenChannel)
node.rpcEnv.Mempool = mp
node.services = append(node.services, mpReactor)