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

chore: catch up main to v21.1.x #7215

Merged
merged 19 commits into from
Dec 30, 2023
Merged

chore: catch up main to v21.1.x #7215

merged 19 commits into from
Dec 30, 2023

Conversation

czarcas7ic
Copy link
Member

Closes: #XXX

What is the purpose of the change

Step 1: Merge this PR
Step 2: Backport to v21.x
Step 3: No longer utilize v21.1.x

@czarcas7ic czarcas7ic added V:state/compatible/backport State machine compatible PR, should be backported A:backport/v21.x backport patches to v21.x branch labels Dec 29, 2023
Copy link
Contributor

Important Notice

This PR modifies an in-repo Go module. It is one of:

  • osmomath
  • osmoutils
  • x/ibc-hooks
  • x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

@czarcas7ic czarcas7ic closed this Dec 29, 2023
@czarcas7ic czarcas7ic reopened this Dec 29, 2023
@czarcas7ic czarcas7ic marked this pull request as ready for review December 29, 2023 19:49
@czarcas7ic czarcas7ic added V:state/compatible/backport State machine compatible PR, should be backported and removed V:state/compatible/backport State machine compatible PR, should be backported labels Dec 29, 2023
Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @czarcas7ic

@czarcas7ic czarcas7ic merged commit c5a5147 into main Dec 30, 2023
1 check passed
@czarcas7ic czarcas7ic deleted the adam/v21.1.x-merge-to-main branch December 30, 2023 03:07
mergify bot pushed a commit that referenced this pull request Dec 30, 2023
* Reduce discrepancy in fee simulation

* Update

* State compatible applyFuncIfNoError event reduction

* Update osmoutils/epochs versions

* Update SDK version

* One more epoch speedup

* Speedup core loop of epoch

* fix test (#7197)

* refactor: auto-set timeout-commit to 4s for faster block times (#7196)

* updates (#7192)

* refactor: auto-set timeout-commit to 4s for faster block times (backport #7180)

* changelog

* Revert "updates (#7192)"

This reverts commit 6cc26f9.

* lint

* Update changelog

* Update changelog

* changelog

* Speedup multiplication

* Try scratch slice

* refactor: arb filter for new authz exec swap (#7210)

* refactor: arb filter for new authz exec swap

* updates

* updates

* updates

* clean up

* Auto: update go.mod after push to adam/v21.1.x-merge-to-main that modified dependencies locally

* add 21.1.5 to changelog

* update comment

---------

Co-authored-by: Dev Ojha <dojha@berkeley.edu>
Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: github-actions <github-actions@github.com>
(cherry picked from commit c5a5147)

# Conflicts:
#	go.mod
#	go.sum
#	osmomath/go.sum
czarcas7ic added a commit that referenced this pull request Dec 30, 2023
* chore: catch up main to v21.1.x (#7215)

* Reduce discrepancy in fee simulation

* Update

* State compatible applyFuncIfNoError event reduction

* Update osmoutils/epochs versions

* Update SDK version

* One more epoch speedup

* Speedup core loop of epoch

* fix test (#7197)

* refactor: auto-set timeout-commit to 4s for faster block times (#7196)

* updates (#7192)

* refactor: auto-set timeout-commit to 4s for faster block times (backport #7180)

* changelog

* Revert "updates (#7192)"

This reverts commit 6cc26f9.

* lint

* Update changelog

* Update changelog

* changelog

* Speedup multiplication

* Try scratch slice

* refactor: arb filter for new authz exec swap (#7210)

* refactor: arb filter for new authz exec swap

* updates

* updates

* updates

* clean up

* Auto: update go.mod after push to adam/v21.1.x-merge-to-main that modified dependencies locally

* add 21.1.5 to changelog

* update comment

---------

Co-authored-by: Dev Ojha <dojha@berkeley.edu>
Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: github-actions <github-actions@github.com>
(cherry picked from commit c5a5147)

# Conflicts:
#	go.mod
#	go.sum
#	osmomath/go.sum

* go mod update

* update go mods from v21.x

---------

Co-authored-by: Adam Tucker <adam@osmosis.team>
Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:backport/v21.x backport patches to v21.x branch C:x/epochs C:x/incentives C:x/superfluid C:x/txfees V:state/compatible/backport State machine compatible PR, should be backported
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants