Merge branch 'next' of github.com:Team-Kujira/core into legacy_proposals

Team-Kujira · Jul 31, 2024 · 14f7255 · 14f7255
2 parents a1cd823 + 02cde7e
commit 14f7255
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/app.go b/app/app.go
@@ -40,7 +40,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/mempool"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -1117,16 +1116,14 @@ func New(
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
 
-	nonceMempool := mempool.NewSenderNonceMempool()
 	propHandler := oracleabci.NewProposalHandler(
 		logger,
 		app.OracleKeeper,
 		app.StakingKeeper,
 		app.ModuleManager,
-		nonceMempool,
+		nil,
 		bApp,
 	)
-	bApp.SetMempool(nonceMempool)
 	bApp.SetPrepareProposal(propHandler.PrepareProposal())
 	bApp.SetProcessProposal(propHandler.ProcessProposal())
 	bApp.SetPreBlocker(propHandler.PreBlocker)