* Update app.go

* Update app.go

* fmt and changelog

Co-authored-by: Roman <ackhtariev@gmail.com>
(cherry picked from commit 8e1b6201

)

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>

* Fix incentives query filtering (#1759)

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

* edge case tests for CalcJoinPoolShares

* add test comments

* move tests to increase coverage and add further comments

* remove expectLiq from new tests

* fix conflicts

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

)

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

* Reintroduce #1719 random tests (#1791)

* Add joon's random tests

* Move file its in

* Use ctx for v10 state machine compatibility

* Change bounds, comment on rounding behavior

Co-authored-by: Dev Ojha <dojha@berkeley.edu>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
(cherry picked from commit 97934d41

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_joinpool_test.go

* Fix merge conflict

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>

(cherry picked from commit 29d8539c

)

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

* Move join pool tests into own file (#1781)

(cherry picked from commit a93b7419

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_test.go

* fix merge errors

* merge conflict fix

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

(cherry picked from commit d9f20316

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_test.go

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

* Tests: Join pool for non-even ratio (#1767)

* added new tests

* tests

* wip

* finish tests

* fix test

* typo

* Add comments

* DRY some of the code

Co-authored-by: stackman27 <sis1001@berkeley.edu>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>
(cherry picked from commit 2cc8fedc

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_test.go

* Apply suggestions from code review

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

* Clean `amm_test.go` (#1775)

* clean

* fix tests

(cherry picked from commit 5f5184a7

)

# Conflicts:
#	x/gamm/pool-models/balancer/amm_test.go

* Apply suggestions from code review

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

* Delete irregular state change logic (#1769)

(cherry picked from commit e7993a45

)

# Conflicts:
#	app/upgrades/v10/constants.go
#	app/upgrades/v10/upgrades.go

* Fix merge conflict

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

* chore: avoid using string comparison for unit testing errors

* fix merge conflict

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

)

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

test: add more calcSingleAssetJoinTestCases with varying ratio of tokenInAmount to existing liquidity (#1757) (#1768)

* tokenIn is large relative to liquidity

* same test case with swap fee

* add cases with large token in relative to existing liquidity

* Update x/gamm/pool-models/balancer/amm_test.go

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

* refactor panic testing

* Update x/gamm/pool-models/balancer/amm_test.go

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

)

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

* Fix insufficient total share creation

* More correctx

* small refactor to expose methods for unit tests

* fix problem with newLiquidity, better names and more comments

* fix typo

* add TestCalcSingleAssetJoin

* add test case to TestCalcSingleAssetJoin

* add test case to TestCalcSingleAssetJoin

* add another Wolfram test case to TestCalcSingleAssetJoin

* another test case for TestCalcSingleAssetJoin

* remove errors from TestCalcSingleAssetJoin

* add TestCalcJoinMultipleSingleAssetTokensIn

* add complex case for TestCalcJoinMultipleSingleAssetTokensIn

* add assetions for liquidity

* add no tokens in TestCalcJoinMultipleSingleAssetTokensIn

* update newLiquidity

* remove else clause

* currTotalShares

* rename to CalcJoinSingleAssetTokensIn

* refactor shares logic in calcJoinSingleAssetTokensIn

* fix comment in test

* update numShares

* use context from parameter

* Update x/gamm/pool-models/balancer/amm_test.go

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

* Update x/gamm/pool-models/balancer/amm_test.go

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

* rename remainingTokensIn

* remove TestCalcSingleAssetJoin

* copy godoc for CalcJoinPoolShares from pool interface

* Update x/gamm/pool-models/balancer/amm.go

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

* move getPoolAssetsByDenom function and test to another PR

* simplify to use recently merged GetPoolAssetsByDenom function

* remove redundant time

* typo

* update name to updatePoolAssetsLiquidity

* add validation for giving tokenIn that is not in pool to calcSingleAssetJoin

* specify that balancer equation is modified with swapFeeRatio added

* Fix merge conflict I introduced

* Improve comments / abstractions (#1761)

* Improve comments / abstractions

* Add eror

* Add swap fee note

* Update x/gamm/pool-models/balancer/amm.go

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

* More comments

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

* mild test cleanup

Co-authored-by: Dev Ojha <dojha@berkeley.edu>
Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
(cherry picked from commit 9432b927

)

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

* Fix pow approx

* Update osmomath/math.go

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

Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
(cherry picked from commit e61ab781

)

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

(cherry picked from commit e8050e2e

)

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

* Add specified documentation and comments on joinpool flow

* Fix typos

* Fix lint

* Make changes suggested by Roman

* Apply suggestions from code review

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

* Update x/gamm/pool-models/balancer/amm.go

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

Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
(cherry picked from commit 3d3b5947

)

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

test: CalcJoinPoolShares unit tests with single token by sharing them with calcSingleAssetJoin (#1720) (#1749)

* chore: add ability to tolerate small inconsistencies in share calculations

* remove redundant conditional

* adding full calculations for all single token cases

* removed personal test case

* correctly located wolfram calcs

* added nonequal weightings test

* gofmt

* added wolfram alpha verifications

* gofmt

* fix test cases

* fix comments and links

* clean up amm.go

* add comment for test case

* fix values in comment

* abstract and reuse calcJoinSharesTestCase struct

* share test cases between TestCalcSingleAssetJoin and TestCalcJoinPoolShares

Co-authored-by: Roman <ackhtariev@gmail.com>
Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit 4c00e816

)

Co-authored-by: Xiangan He <76530366+xBalbinus@users.noreply.github.com>

* Add v10 forking logic (#1741)

* Add v10 forking logic

* Add logic for transition

* Try adding test

* WOrking test case

(cherry picked from commit 2bf34ddb

)

# Conflicts:
#	app/app.go
#	app/upgrades/v10/constants.go
#	app/upgrades/v10/upgrades.go

* Fix merge conflicts

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

(cherry picked from commit d834c033

)

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

(cherry picked from commit ee4d14eb

)

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

* chore: add ability to tolerate small inconsistencies in share calculations

* remove redundant conditional

* godoc

(cherry picked from commit 2dd7e1ed

)

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

* Return correct number of shares when joining stableswap pool

The `joinPoolSharesInternal` method was not taking into account the newShares from single-sided LP joins.

* Update changelog

Co-authored-by: Roman <roman@osmosis.team>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 2d1804b9

)

Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com>

(cherry picked from commit 94d9b70a

)

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

* add randomized test

* use IsAnyGT instead

* Apply suggestions from code review

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

* use time.Now as random source

* Update x/gamm/pool-models/balancer/amm_test.go

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

* Update x/gamm/pool-models/balancer/amm_test.go

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

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
(cherry picked from commit 10df06cf

)

Co-authored-by: mconcat <monoidconcat@gmail.com>

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

)

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

* chore: upgrade sdk with snapshot manager fix (#1700)

* chore: upgrade sdk with snapshot manager fix

* changelog

* Update branch version

* Try fix e2e test

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Dev Ojha <dojha@berkeley.edu>
(cherry picked from commit 9165ac2d

)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

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

* Fix spotprice sigfig rounding for small spot prices (#1699)

* Fix spotprice sigfig rounding for small spot prices

* Changelog

* Fix off by one in precision

* Address PR comment

(cherry picked from commit c2119998

)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

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

* Query osmo equivilent is staked via superfluid (#1632)

* fix proto

* get osmo equivilent is staked via superfluid

* format

* fix go_fmt

* Revert "fix go_fmt"

This reverts commit 54071058.

* augment SuperfluidDelegationsByDelegator query

* remove fmt

* format

* fix spell

* fix spell, changelog

* query

(cherry picked from commit 19fedeb7

)

# Conflicts:
#	x/superfluid/keeper/grpc_query.go

* resolved

* fix lint

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

* dont change operator address

* state export changes

* additions

* changes

* apt get update

* changes

* extra notes

* adding flags

* add ID

* linter fixes

* move files

(cherry picked from commit 8043e657

)

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

* upgrade guide for v9

* linter fix

* first working version

* better makefile commands and docs

* fix osmosisd start script to expose rpc port

* changelog

(cherry picked from commit d5cd0332

)

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