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

Added rate limits in upgrade (backport #4340) #4405

Merged
merged 2 commits into from
Feb 23, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2023

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

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

You are currently cherry-picking commit a1e2b3d4.
  (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:   app/keepers/keepers.go
	modified:   app/keepers/modules.go
	modified:   app/upgrades/v15/export_test.go
	modified:   app/upgrades/v15/upgrade_test.go
	modified:   app/upgrades/v15/upgrades.go
	new file:   proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto
	modified:   proto/osmosis/ibc-rate-limit/v1beta1/query.proto
	new file:   proto/osmosis/ibc-rate-limit/v1beta1/query.yml
	modified:   tests/e2e/configurer/chain/chain.go
	modified:   tests/e2e/configurer/chain/commands.go
	modified:   tests/e2e/configurer/chain/queries.go
	modified:   tests/e2e/configurer/upgrade.go
	modified:   x/ibc-rate-limit/client/cli/query.go
	new file:   x/ibc-rate-limit/client/grpc/grpc_query.go
	new file:   x/ibc-rate-limit/client/query_proto_wrap.go
	renamed:    x/ibc-rate-limit/types/query.pb.go -> x/ibc-rate-limit/client/queryproto/query.pb.go
	renamed:    x/ibc-rate-limit/types/query.pb.gw.go -> x/ibc-rate-limit/client/queryproto/query.pb.gw.go
	new file:   x/ibc-rate-limit/genesis.go
	new file:   x/ibc-rate-limit/genesis_test.go
	modified:   x/ibc-rate-limit/ibc_module.go
	new file:   x/ibc-rate-limit/ibcratelimitmodule/module.go
	modified:   x/ibc-rate-limit/ics4_wrapper.go
	deleted:    x/ibc-rate-limit/module.go
	new file:   x/ibc-rate-limit/types/genesis.go
	new file:   x/ibc-rate-limit/types/genesis.pb.go
	modified:   x/ibc-rate-limit/types/keys.go
	modified:   x/ibc-rate-limit/types/params.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/modules.go
	both modified:   tests/e2e/e2e_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

* added rate limits in upgrade

* added upgrade test

* refactor rate limiting tests and added rate limits pre-upgrade

* lint

* goimports

* experiments for E2E

* post merge lints

* added RL before upgrade

* just get the latest contract

* experiments

* updated wasm file

* remove unnecessary prints

* bad check

* experiments without e2e

* removed unnecessary fmt

* param space initialization for rate limiting (#4360)

* param space initialization for rate limiting

* lint

* better test

* properly initialize empty params

* fix typo

* adding RL to E2E

* removing RL again from E2E

* debug

* genesis

* genesis 2

* add genesis and solve params bug

* uncomment setup rate limiting

* added configurable gov module

* clean up

* clean up and genesis test

* upgrade handler

* genesis clean up

* clean up e2e

* wire querier

* route fix

* fix router

* debug things

* fix init genesis bug

* push fix

* lint

* fix

* clean up upgrades

* testing propper params after upgrade in E2E

* "properly" unmarshaling the parm

* goimports

* allowing for types other than objects in cosmwasm queries

* fix check for param reset

* remove unnecessary prints

* compiled with the proper vesion of workspace optimizer

* Revert "compiled with the proper vesion of workspace optimizer"

This reverts commit ab5cf6c.

* added length check

* params experiment for test with state-export

---------

Co-authored-by: Roman <[email protected]>
Co-authored-by: Roman <[email protected]>
(cherry picked from commit a1e2b3d)

# Conflicts:
#	app/modules.go
#	tests/e2e/e2e_test.go
@mergify mergify bot added the conflicts label Feb 23, 2023
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:CLI labels Feb 23, 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. Confirmed backport

@p0mvn p0mvn merged commit 54fa74d into v15.x Feb 23, 2023
@p0mvn p0mvn deleted the mergify/bp/v15.x/pr-4340 branch February 23, 2023 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:app-wiring Changes to the app folder C:CLI conflicts
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants