(cherry picked from commit 6d935e33

)

Co-authored-by: Ajaz Ahmed Ansari <ajansari9585@gmail.com>

* Remove localosmois Dockerfile

* Retain .osmosisd folder

(cherry picked from commit 09b18a5f

)

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>

* x/incentives: cli updates (#1985)

* incentives cli updates

* linter fix

* Update x/incentives/client/cli/query.go

Co-authored-by: Roman <roman@osmosis.team>

* Update x/incentives/client/cli/query.go

Co-authored-by: Roman <roman@osmosis.team>

* make Roman suggestions

* make review suggestions

* revert suggestion

* address roman comment error verbiage

* linter

* address review comments

* get est rewards fix

* fix comment

Co-authored-by: Roman <roman@osmosis.team>
(cherry picked from commit 079bdd49

)

# Conflicts:
#	x/incentives/client/cli/cli_test.go
#	x/incentives/client/cli/query.go

* fix conflicts

Co-authored-by: Adam Tucker <adam@osmosis.team>

* Puneet/epochevents (#2515)

* add events from cachectx to main ctx events

* add tests for events from hooks.

* add entry to CHANGELOG.md

(cherry picked from commit 1b5e970c

)

# Conflicts:
#	CHANGELOG.md

* Fix conflict

Co-authored-by: Puneet <59960662+puneet2019@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

* Move check-generated scripts to scripts/ci folder

* Remove contrib folder

* Remove contrib folder references

(cherry picked from commit 528bd920

)

# Conflicts:
#	contrib/images/osmobuilder/Makefile

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>

(cherry picked from commit d2a16492

)

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>

(cherry picked from commit c483c32f

)

Co-authored-by: Roman <roman@osmosis.team>

* Remove schedule

* Remove alarm, use height parameter for previous versions

(cherry picked from commit a630449a

)

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>

refactor(x/mint): remove SetInitialSupplyOffsetDuringMigration keeper method (backport #2418) (#2456)

* refactor(x/mint): remove SetInitialSupplyOffsetDuringMigration keeper method (#2418)

* refactor(x/mint): remove SetInitialSupplyOffsetDuringMigration keeper function

* changelog

* resolve merge conflict

(cherry picked from commit 3d7d48c8

)

# Conflicts:
#	CHANGELOG.md
#	x/mint/keeper/keeper_test.go

* Fix conflict

Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

* feat: add multiple docker images (#2440)

* Change default image && copy all go deps in 1 layer

* Extend workflow to push multiple docker images

(cherry picked from commit 4b5eccf0

)

# Conflicts:
#	Dockerfile

* Fix conflicts

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>
Co-authored-by: Niccolo Raspa <nraspa@live.it>

* Fix reproducible linux builds  (#2427)

* Avoid hardcoding CosmWasm version

* Improve Dockerfile and enable reproducible builds

* add start cmd to e2e test

Co-authored-by: Adam Tucker <adam@osmosis.team>
(cherry picked from commit c83936c5

)

# Conflicts:
#	Dockerfile
#	tests/e2e/containers/containers.go

* Fix conflicts in Dockerfile

* Remove unconsistent file

* Replace command to get cosmwasm version

* add fix

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>
Co-authored-by: Niccolo Raspa <nraspa@live.it>
Co-authored-by: Adam Tucker <adam@osmosis.team>

* improve superfluid errors

* fix formatting

* Update x/superfluid/keeper/stake.go

Co-authored-by: Adam Tucker <adam@osmosis.team>

Co-authored-by: Adam Tucker <adam@osmosis.team>
(cherry picked from commit 68c8cb43

)

Co-authored-by: Roman <roman@osmosis.team>

(cherry picked from commit df2c511b

)

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>

* Refactor distr_test.go to table-driven (#2192)

* TestUpdateDistrRecords

* TestReplaceDistrRecords

* TestAllocateAsset

* format

* suite.Require

* remove fmt

* format

* format

* rename args

* remove old test func, already in new tests

* refactor test struct

* add comment, calculate

* use default bond denom

* refactor AllocateAsset tests

* fix go mod

(cherry picked from commit 6c0c8ad8

)

# Conflicts:
#	go.mod
#	go.sum

* resolve conflict

* fix

* go mod tidy

* resolve conflict

* fix

* no change go mod go sum

Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com>

Co-authored-by: Roman <ackhtariev@gmail.com>

* chore: v11.0.1 changelog

* typo

* chore: update import paths on v11.x

* changelog

* Use external volume as cache && fix backporting height (#2383)

(cherry picked from commit c5b74241

)

# Conflicts:
#	.github/workflows/check-state-compatibility.yaml

* Fix conflicts

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>
Co-authored-by: Niccolo Raspa <nraspa@live.it>

refactor(ci): improve update paths job with per-branch names and check out non-main branch (#2400) (#2402)

(cherry picked from commit a1dc6941

)

Co-authored-by: Roman <roman@osmosis.team>

Co-authored-by: Roman <ackhtariev@gmail.com>

(cherry picked from commit ef0dc173

)

Co-authored-by: Roman <roman@osmosis.team>

Co-authored-by: Roman <ackhtariev@gmail.com>

Co-authored-by: Roman <ackhtariev@gmail.com>

* fix(ci): import paths script to work with query gen

* Update scripts/replace_import_paths.sh

* echo for query gen and remove redundant file check

* double quote

(cherry picked from commit 9b75ed9c

)

Co-authored-by: Roman <roman@osmosis.team>

(cherry picked from commit e83b31c2

)

# Conflicts:
#	scripts/replace_import_paths.sh

Co-authored-by: Roman <roman@osmosis.team>

* [README] Contributing.md: Simplify test examples (#2314)

* simpler tests

* nit

* removed setup case

* rom and matt feedback

(cherry picked from commit 729324c6

)

# Conflicts:
#	CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

Co-authored-by: Sishir Giri <sis1001@berkeley.edu>

(cherry picked from commit 4f991d37

)

Co-authored-by: Roman <roman@osmosis.team>

* Chore: add build tags to e2etest (#2231)

* add build tags to e2etest

* update makefile

* update VS Code Debug Configuration in e2e test README

* init_test e2e

* e2e package in makefile

(cherry picked from commit 5e2bb89f

)

# Conflicts:
#	Makefile
#	tests/e2e/README.md

* fix conflict

* Update Makefile

Co-authored-by: vuong <56973102+vuong177@users.noreply.github.com>
Co-authored-by: vuong <nguyenvuong1122000@gmail.com>

* Remove unused cdc arguments (#2319)

* Remove unused cdc arguments

* undo removal in superfluid

(cherry picked from commit 201d81d2

)

* Fix conflicts

* Update x/pool-incentives/keeper/keeper.go

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

(cherry picked from commit 3d866e43

)

Co-authored-by: Sishir Giri <sis1001@berkeley.edu>

chore(deps): Bump github.com/prometheus/client_golang from 1.12.2 to 1.13.0 (backport #2329) (#2335)

* chore(deps): Bump github.com/prometheus/client_golang (#2329)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.2 to 1.13.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.12.2...v1.13.0

)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 2176ae51

)

# Conflicts:
#	go.mod
#	go.sum

* Fix merge conflict

* Fix merge conflict

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mattverse <mattpark1028@gmail.com>

(cherry picked from commit c22395ca

)

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>

* Msg test (#2316)

* rename package in gamm msg_test.go

* incentives: msg_test.go

* gamm pool-modules : balancer and stable swap

(cherry picked from commit 5ebcd61b

)

# Conflicts:
#	x/incentives/types/msgs_test.go

* Fix conflict

Co-authored-by: vuong <56973102+vuong177@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

* set epoch time KeeperTestHelper; change BeginNewBlockWithProposer

* fix test

(cherry picked from commit 7c7b317a

)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

* Fix epochs modules tests (#1893)

* Fix epochs modules tests

* Remove debug code

* Fix altered API usage within superfluid

* Add changelog entry

* Add more AddEpochInfo checks

* Fix superfluid tests

* Update osmoutils/slice_helper.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Changelog nit

* Apply Roman's suggestions!

Co-authored-by: Roman <roman@osmosis.team>

* add const

* Apply roman's suggestion of tests w/ non-default values

* Apply roman's comment update suggestions

* AddEpochInfo comment

* fix gomod order

* Move epochs begin block code to keeper (#1870)

(cherry picked from commit 982aa0ef

)

# Conflicts:
#	x/epochs/keeper/abci.go
#	x/epochs/keeper/abci_test.go

* Fix conflict

* Fix more conflicts

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

* refactor(x/mint): simplify TestDistributeMintedCoin

* rename mock

* clean up

(cherry picked from commit 4c990f58

)

Co-authored-by: Roman <roman@osmosis.team>

* Update chain registry for Osmosis upgrade (#2297)

(cherry picked from commit 80bd776b

)

# Conflicts:
#	chain.schema.json
#	go.mod

* Fix conflict

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

Co-authored-by: Roman <ackhtariev@gmail.com>