From 2b2d1179cc356704e10e3f137f9eca2c855c848b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:10:39 +0200
Subject: [PATCH] feat(abci): Add context to SelectedTxs (backport #17940)
 (#17941)

---
 baseapp/abci_utils.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/baseapp/abci_utils.go b/baseapp/abci_utils.go
index 7803781d9f..0b570ab52a 100644
--- a/baseapp/abci_utils.go
+++ b/baseapp/abci_utils.go
@@ -215,7 +215,7 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 				}
 			}
 
-			return &abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs()}, nil
+			return &abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs(ctx)}, nil
 		}
 
 		iterator := h.mempool.Select(ctx, req.Txs)
@@ -242,7 +242,7 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 			iterator = iterator.Next()
 		}
 
-		return &abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs()}, nil
+		return &abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs(ctx)}, nil
 	}
 }
 
@@ -333,7 +333,7 @@ func NoOpVerifyVoteExtensionHandler() sdk.VerifyVoteExtensionHandler {
 // track of the selected transactions themselves.
 type TxSelector interface {
 	// SelectedTxs should return a copy of the selected transactions.
-	SelectedTxs() [][]byte
+	SelectedTxs(ctx context.Context) [][]byte
 
 	// Clear should clear the TxSelector, nulling out all relevant fields.
 	Clear()
@@ -355,7 +355,7 @@ func NewDefaultTxSelector() TxSelector {
 	return &defaultTxSelector{}
 }
 
-func (ts *defaultTxSelector) SelectedTxs() [][]byte {
+func (ts *defaultTxSelector) SelectedTxs(_ context.Context) [][]byte {
 	txs := make([][]byte, len(ts.selectedTxs))
 	copy(txs, ts.selectedTxs)
 	return txs