From e88539fe90bd177f51cb9560215df6831219d183 Mon Sep 17 00:00:00 2001 From: Devon Bear Date: Mon, 9 Oct 2023 07:10:36 -0400 Subject: [PATCH 1/2] feat(baseapp): expose `Mempool` (#17954) (cherry picked from commit 68a136b48d2a3418ddcd86f560d167c523c46804) # Conflicts: # baseapp/baseapp.go --- baseapp/baseapp.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 7c82ff493de..aa67b7e710c 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -351,6 +351,24 @@ func (app *BaseApp) LastBlockHeight() int64 { return app.cms.LastCommitID().Version } +<<<<<<< HEAD +======= +// ChainID returns the chainID of the app. +func (app *BaseApp) ChainID() string { + return app.chainID +} + +// AnteHandler returns the AnteHandler of the app. +func (app *BaseApp) AnteHandler() sdk.AnteHandler { + return app.anteHandler +} + +// Mempool returns the Mempool of the app. +func (app *BaseApp) Mempool() mempool.Mempool { + return app.mempool +} + +>>>>>>> 68a136b48 (feat(baseapp): expose `Mempool` (#17954)) // Init initializes the app. It seals the app, preventing any // further modifications. In addition, it validates the app against // the earlier provided settings. Returns an error if validation fails. From 2f5ad62dc464ac8769d867363d6c5984c98ff480 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 9 Oct 2023 13:24:25 +0200 Subject: [PATCH 2/2] updates --- CHANGELOG.md | 1 + baseapp/baseapp.go | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93f045160ed..8eca4b873b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (baseapp) [#17954](https://github.com/cosmos/cosmos-sdk/issues/17954) Add `Mempool()` method on `BaseApp` to allow access to the mempool. * (x/gov) [#17780](https://github.com/cosmos/cosmos-sdk/pull/17780) Recover panics and turn them into errors when executing x/gov proposals. ### Bug Fixes diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index aa67b7e710c..c2ce465ca9c 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -351,24 +351,11 @@ func (app *BaseApp) LastBlockHeight() int64 { return app.cms.LastCommitID().Version } -<<<<<<< HEAD -======= -// ChainID returns the chainID of the app. -func (app *BaseApp) ChainID() string { - return app.chainID -} - -// AnteHandler returns the AnteHandler of the app. -func (app *BaseApp) AnteHandler() sdk.AnteHandler { - return app.anteHandler -} - // Mempool returns the Mempool of the app. func (app *BaseApp) Mempool() mempool.Mempool { return app.mempool } ->>>>>>> 68a136b48 (feat(baseapp): expose `Mempool` (#17954)) // Init initializes the app. It seals the app, preventing any // further modifications. In addition, it validates the app against // the earlier provided settings. Returns an error if validation fails.