(cherry picked from commit 9b2bb85c

)

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

* minor changelog bump (#2839)

(cherry picked from commit 39b32018

)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

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

(cherry picked from commit 2d6340c2

)

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

(cherry picked from commit 5fd054ef

)

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

* Refactors testnetify and remove last localOsmosis Dockerfile (#2795)

* Refactor testnetify and remove Dockerfile

* Manually replace new validator public key

* Improve output formatting

* Bug fixes

* Add ACCOUNT_PUBKEY and ACCOUNT_ADDRESS input

* Add environment variables as input and config folder check

* Update docs, Makefile and rename folder

* Modify CLI arguments

* Update docker-compose.yaml defaults and print updated values

* Invert printing logic replacing verbose with quiet

(cherry picked from commit 3fa5450e

)

# Conflicts:
#	tests/localosmosis/README.md

* fix md conflicts

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

(cherry picked from commit d546d266

)

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

(cherry picked from commit b4a32bd3

)

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

* remove fix gas constant & related test

* format

* bump IBC version (#2801)

* bump IBC version

* Update SDK verison

(cherry picked from commit 72bec75f

)

# Conflicts:
#	go.mod
#	go.sum

* Fix SDK version to be v12

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

(cherry picked from commit 6342691d

)

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

(cherry picked from commit 0378e542

)

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

(cherry picked from commit df1a4878

)

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

* Make gamm pools override addr already exists

* Apply code comments

(cherry picked from commit f86746e7

)

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

* pool incentives export patch

* Update proto/osmosis/pool-incentives/v1beta1/incentives.proto

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

* make Dev suggestion

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
(cherry picked from commit 877008eb

)

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

* Revert "Commit timeout (#2057)"

This reverts commit 701b3910.

* remove changelog entry

* keep timeout in init

(cherry picked from commit 0df62563

)

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

* fix unlocking bug

* explicitly allow empty coins

* added fixes

* remove white space

(cherry picked from commit 0997049b

)

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

* chore: upgrade wasmd to v0.28.0 (#2714)

* chore: upgrade wasmd to v0.28.0

* changelog

* fix simulator

* update dependency

* simulator time hack

* update simulator

* remove curTime

* update tag

* update comments

* updates

* update wasmd dep

(cherry picked from commit b1c92ae4

)

* updates

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

* Revert "chore: Update Proto + ~~ORM Support~~ (#1589)" (#2614)

* Revert "chore: Update Proto + ~~ORM Support~~ (#1589)"

This reverts commit f291e12d

.

* Update scripts/protocgen.sh

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

* Run buf mod update

* query gen

* Change pb

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

)

* Fix proto check

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
Co-authored-by: mattverse <mattpark1028@gmail.com>

* chore: update sdk for dependency (v12)

* update to the latest correct tag

* updates

(cherry picked from commit 1e4cbb3c

)

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

* x/twap: three asset pool tests (part 2 of 2) (#2690)

* threeAssetPool twap test api.go

* keeper test threeAssetPool

* three asset pool twap tests part 2

* correct number

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* apply suggestions from code review

* implement Roman's suggestion

* go docs

* change tap to threeAsset

* remove additional comment

* change tap to threeAsset

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

)

# Conflicts:
#	x/twap/logic_test.go

* fix conflict

* fix conflict

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

* localosmosis patch (#2728)

(cherry picked from commit 69d648c7

)

# Conflicts:
#	Makefile

* fix conflict

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

* e2e: make TWAP test for three asset pools (#2718)

* three asset pool twap e2e tests

* change pre upgrade init to mint ion

* update docker image

* docker image

* update docker image

* docker update

* docker changes

* Update config.go

(cherry picked from commit 79432d20

)

# Conflicts:
#	tests/e2e/e2e_test.go

* merge main

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

* test(e2e/twap): twap query before/after swap and after pruning

* log records

* progress

* updates

* updates

* updates

* updates

* updates

* Update tests/e2e/configurer/chain/chain.go

* updates

* fix

* log records

* logs

* updates

* updates

* restore build tags

* revert me - propagate context to compute

* revert me

* revert me

* revert

* revert me

* revert

* revert - try larger sig fig exponent

* Revert "revert - try larger sig fig exponent"

This reverts commit eca7b98d.

* Revert "revert"

This reverts commit 6dc1561a.

* Revert "revert me"

This reverts commit 50729078.

* Revert "revert"

This reverts commit 7f953728.

* Revert "revert me"

This reverts commit 2b9424db.

* Revert "revert me"

This reverts commit 240f3812.

* Revert "revert me - propagate context to compute"

This reverts commit 90a707f3

.

* error threshold

* clean up

* add comment about pruning at epoch

* Update tests/e2e/e2e_test.go

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

* Adam's comment

* update query paths

* address comments

* change check

* stricter assertion

* add remaining True cases

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

)

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

* Change hex into bytes in test code

* Fix proto check

* Proto fix

(cherry picked from commit e55b0cf3

)

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

This reverts commit 5caabd67.

* Remove Get from GetArithmeticTwap query & GetArithmeticTwapToNow query

* update whitelist

* Fix comment + lint

(cherry picked from commit 9038895a

)

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

* progress

* progress

* progress

* progress

* more test cases

* simplify tests

* cover record count by tests

* lint

* fix logic

* update godoc

* revert `getSpotPrices` change

* spurious whitespace

* Update x/twap/logic_test.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

* Update x/twap/logic_test.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

* rename to TestUpdateRecord

* Update x/twap/logic_test.go

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

* infer most recent from historical

* denom

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
Co-authored-by: Adam Tucker <adam@osmosis.team>
(cherry picked from commit 3e44618b

)

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

* factor out calcjoinpool test cases into separate var

* clean up comments

* add joinpool unit tests

* clean up comments

* run make proto-all

* rename joinpool tests to multi asset tests

* add comments for test readability

(cherry picked from commit bbc89b12

)

Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>

* add spot price error tests to twap getter

* add more cases

(cherry picked from commit 209d106a

)

Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>

Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](https://github.com/spf13/viper/compare/v1.12.0...v1.13.0

)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 52cf5669

)

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

* threeAssetPool twap test api.go

* keeper test threeAssetPool

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* Update x/twap/api_test.go

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

* apply suggestions from code review

* implement Roman's suggestion

* go docs

* change tap to threeAsset

* remove additional comment

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

)

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

(cherry picked from commit 4bbd3fb4

)

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

(cherry picked from commit 85beb4f5

)

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

* Start changelog prepartion

* asdf

(cherry picked from commit f02f5e93

)

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