Skip to content

Work around indexing problem for duplicate transactions (forward port: #8625) (backport #8945)#8950

Merged
cmwaters merged 8 commits intov0.35.xfrom
mergify/bp/v0.35.x/pr-8945
Jul 21, 2022
Merged

Work around indexing problem for duplicate transactions (forward port: #8625) (backport #8945)#8950
cmwaters merged 8 commits intov0.35.xfrom
mergify/bp/v0.35.x/pr-8945

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 6, 2022

This is an automatic backport of pull request #8945 done by Mergify.
Cherry-pick of be6d74e has failed:

On branch mergify/bp/v0.35.x/pr-8945
Your branch is up to date with 'origin/v0.35.x'.

You are currently cherry-picking commit be6d74e65.
  (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:   internal/state/indexer/indexer_service_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG_PENDING.md
	both modified:   internal/state/indexer/indexer_service.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#8625) (#8945)

Port the bug fix terra-money#76 to upstream. This is critical for ethermint json-rpc to work.

fix: prevent duplicate tx index if it succeeded before
fix: use CodeTypeOk instead of 0
fix: handle duplicate txs within the same block
Co-authored-by: jess jesse@soob.co

ref: #5281

Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
(cherry picked from commit be6d74e)

# Conflicts:
#	CHANGELOG_PENDING.md
#	internal/state/indexer/indexer_service.go
@cmwaters cmwaters merged commit 0d2bf39 into v0.35.x Jul 21, 2022
@cmwaters cmwaters deleted the mergify/bp/v0.35.x/pr-8945 branch July 21, 2022 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant