Skip to content
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

feat(twap): prune records over multiple blocks (backport #7427) #7441

Merged
merged 1 commit into from
Feb 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

This is an automatic backport of pull request #7427 done by Mergify.
Cherry-pick of 1c9e491 has failed:

On branch mergify/bp/v23.x/pr-7427
Your branch is up to date with 'origin/v23.x'.

You are currently cherry-picking commit 1c9e4918.
  (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:   proto/osmosis/twap/v1beta1/twap_record.proto
	modified:   x/twap/export_test.go
	modified:   x/twap/keeper.go
	modified:   x/twap/listeners.go
	modified:   x/twap/listeners_test.go
	modified:   x/twap/logic.go
	modified:   x/twap/logic_test.go
	modified:   x/twap/store.go
	modified:   x/twap/store_test.go
	modified:   x/twap/types/keys.go
	modified:   x/twap/types/twap_record.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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


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

* twap prune over multiple blocks

* changelog entry

* fix after epoch end test

* track where we left off in iteration

* add comment to explain better

* Generated protofile changes

* inc by 2

* inc by 2

* add comments

* add twap pruning test over multiple blocks

---------

Co-authored-by: github-actions <[email protected]>
(cherry picked from commit 1c9e491)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Feb 9, 2024
@github-actions github-actions bot added the C:x/twap Changes to the twap module label Feb 9, 2024
@czarcas7ic czarcas7ic merged commit 1a3b424 into v23.x Feb 9, 2024
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v23.x/pr-7427 branch February 9, 2024 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/twap Changes to the twap module conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant