Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2025

Description

Fixes #2224


This is an automatic backport of pull request #2286 done by Mergify.

## Description

Fixes #2224

(cherry picked from commit ec6fdca)

# Conflicts:
#	consensus/replay_stubs.go
#	mempool/cache.go
#	mempool/cache_test.go
#	mempool/cat/pool.go
#	mempool/cat/pool_test.go
#	mempool/cat/reactor.go
#	mempool/clist_mempool.go
#	mempool/mempool.go
#	mempool/mocks/mempool.go
#	mempool/nop_mempool.go
#	mempool/priority/mempool.go
#	mempool/priority/mempool_test.go
#	rpc/core/tx.go
Copy link
Contributor Author

mergify bot commented Aug 6, 2025

Cherry-pick of ec6fdca has failed:

On branch mergify/bp/main/pr-2286
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit ec6fdcad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   abci/example/kvstore/kvstore.go
	modified:   rpc/client/rpc_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   consensus/replay_stubs.go
	both modified:   mempool/cache.go
	both modified:   mempool/cache_test.go
	both modified:   mempool/cat/pool.go
	both modified:   mempool/cat/pool_test.go
	both modified:   mempool/cat/reactor.go
	both modified:   mempool/clist_mempool.go
	both modified:   mempool/mempool.go
	both modified:   mempool/mocks/mempool.go
	both modified:   mempool/nop_mempool.go
	both modified:   mempool/priority/mempool.go
	both modified:   mempool/priority/mempool_test.go
	both modified:   rpc/core/tx.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ninabarbakadze ninabarbakadze self-assigned this Aug 6, 2025
@ninabarbakadze ninabarbakadze marked this pull request as draft August 6, 2025 18:51
@evan-forbes
Copy link
Member

@ninabarbakadze do we need this? if so do you mind getting it ready to merge?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extend rejected tx indexing to include log as well
2 participants