10000 indexer-respect-height-params-on-query (backport #1529) by mergify[bot] · Pull Request #1543 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

indexer-respect-height-params-on-query (backport #1529) #1543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Oct 26, 2023

This is an automatic backport of pull request #1529 done by Mergify.
Cherry-pick of 95aca04 has failed:

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

You are currently cherry-picking commit 95aca040f.
  (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:
	new file:   .changelog/unreleased/bug-fixes/1529-indexer-respect-height-params-on-query.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   state/indexer/query_range.go
	both modified:   state/txindex/kv/kv_test.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

* indexer-respect-height-params-on-query

* Update .changelog/unreleased/bug-fixes/1529-indexer-respect-height-params-on-query.md

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
(cherry picked from commit 95aca04)

# Conflicts:
#	state/indexer/query_range.go
#	state/txindex/kv/kv_test.go
@mergify mergify bot requested a review from a team as a code owner October 26, 2023 09:53
@mergify mergify bot added the conflicts label Oct 26, 2023
@jmalicevic jmalicevic self-assigned this Oct 26, 2023
@jmalicevic jmalicevic added bug Something isn't working indexer labels Oct 26, 2023
@jmalicevic jmalicevic added this to the 2023-Q4 milestone Oct 26, 2023
@jmalicevic
Copy link
Contributor

Checked the diff of diffs, only difference is in the different naming of the tags in 0.37 compared to what is used in main

@jmalicevic jmalicevic merged commit 60ee8ca into v0.37.x Oct 26, 2023
@jmalicevic jmalicevic deleted the mergify/bp/v0.37.x/pr-1529 branch October 26, 2023 10:50
nivasan1 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
…tbft#1543)

* indexer-respect-height-params-on-query (cometbft#1529)

* indexer-respect-height-params-on-query

* Update .changelog/unreleased/bug-fixes/1529-indexer-respect-height-params-on-query.md

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
(cherry picked from commit 95aca04)

# Conflicts:
#	state/indexer/query_range.go
#	state/txindex/kv/kv_test.go

* Resolved conflicts

---------

Co-authored-by: Kamen Stoykov <24619432+kstoykov@users.noreply.github.com>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working indexer
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants
0