Merge 55e01d810d into dc888ceb78

cmd/0gchaind/app.go

@@ -110,7 +110,7 @@ func (ac appCreator) newApp(
 		skipLoadLatest = cast.ToBool(appOpts.Get(flagSkipLoadLatest))
 	}
 	mempoolMaxTxs := cast.ToInt(appOpts.Get(server.FlagMempoolMaxTxs))
-	mempool := app.NewPriorityMempool()
+	mempool := app.NewPriorityMempool(app.PriorityNonceWithMaxTx(mempoolMaxTxs))
 
 	bApp := app.NewBaseApp(logger, db, ac.encodingConfig,
 		baseapp.SetPruning(pruningOpts),