Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge main into concentrated-liquidity-main (osmosis-labs#3149)
* Add servers to openapi spec file (osmosis-labs#2980) * Chain.schema.json: Added ibc data, fix genesis name, formatting (osmosis-labs#3077) Closes: #XXX ## What is the purpose of the change > Add a description of the overall background and high level changes that this PR introduces *(E.g.: This pull request improves documation of area A by adding ....* To update the chain schema codebase data. This file Auto-updates the chain registry. ## Brief Changelog *(for example:)* - *The metadata is stored in the blob store on job creation time as a persistent artifact* - *Deployments RPC transmits only the blob storage reference* - *Daemons retrieve the RPC data from the blob cache* Added ibc data (ibc go version and enabled features(ics-20), fix genesis name, (was version number before, now goes by name) minor formatting chg. ## Testing and Verifying *(Please pick one of the following options)* --> This change is a trivial rework / code cleanup without any test coverage. *(or)* This change is already covered by existing tests, such as *(please describe tests)*. *(or)* This change added tests and can be verified as follows: *(example:)* - *Added unit test that validates ...* - *Added integration tests for end-to-end deployment with ...* - *Extended integration test for ...* - *Manually verified the change by ...* ## Documentation and Release Note - Does this pull request introduce a new feature or user-facing behavior changes? (yes / no) No - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? (yes / no) No - How is the feature or change documented? (not applicable / specification (`x/<module>/spec/`) / [Osmosis docs repo](https://github.com/osmosis-labs/docs) / not documented) not documented * labels (osmosis-labs#3082) * [x/gamm][stableswap]: Expand inverse relation tests to multi assets and add scaling factors (osmosis-labs#3006) * expand inverse relation tests to multi assets and add scaling factors * tighten binary search bounds to fit spec * remove todo * Fix sped * move output negation to caller Co-authored-by: Dev Ojha <dojha@berkeley.edu> * remove all uses of two-asset binary search solver (osmosis-labs#3084) * [stableswap]: Implement simplified direct multi-asset CFMM solver (osmosis-labs#3068) Closes: osmosis-labs#2730 ## What is the purpose of the change This PR implements a direct solver for our multi-asset CFMM. Similar to our two-asset direct solver, it is intended to be kept in our codebase as a reference implementation and proof for our CFMM but is outclassed by our binary search solver for practical use. ## Brief Changelog - Implement direct multi-asset solver and test it against our full suite of CFMM cases ## Testing and Verifying - The solver implementation is tested against our full multi-asset CFMM test suite in `amm_test.go` ## Documentation and Release Note - Does this pull request introduce a new feature or user-facing behavior changes? (no) - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? (no) - How is the feature or change documented? (not documented) * refactor: remove PokePool from the PoolI interface, define on extension instead (osmosis-labs#3035) * refactor: remove PokePool from the PoolI interface, use extension instead * changelog * fix weights bug * Update x/gamm/keeper/pool_test.go Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com> * Update x/gamm/keeper/pool_test.go * address comments Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com> * ci(CL): run tests on CL branch and add backport config (osmosis-labs#3095) * ci(CL): run tests on CL branch and add backport config * Update .github/mergify.yml * After create pool test (osmosis-labs#2783) * add test for afterCreatePool * format * add test to check trackChangePool Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com> * fix GetModuleToDistributeCoins (osmosis-labs#2957) * update comment in gamm module (osmosis-labs#3103) * chore(deps): Bump github.com/tendermint/tendermint (osmosis-labs#3106) Bumps [github.com/tendermint/tendermint](https://github.com/tendermint/tendermint) from 0.34.21 to 0.34.22. - [Release notes](https://github.com/tendermint/tendermint/releases) - [Changelog](https://github.com/tendermint/tendermint/blob/main/CHANGELOG.md) - [Commits](tendermint/tendermint@v0.34.21...v0.34.22) --- updated-dependencies: - dependency-name: github.com/tendermint/tendermint dependency-type: direct:production update-type: version-update:semver-patch ... 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> * chore(deps): Bump github.com/golangci/golangci-lint (osmosis-labs#3104) Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.50.0 to 1.50.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.50.0...v1.50.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-patch ... 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> * chore(deps): Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (osmosis-labs#3105) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-patch ... 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> * chore: update concentrated liquidity backport label (osmosis-labs#3115) * feat(osmomath): log2 approximation (osmosis-labs#2788) * feat: osmomath log2 approximation * lint * fix comment * comment * Update osmomath/decimal.go * improve accuracy with narrower range * comment * implement and test precise log for x >= 1 * tests for negative values * make non-mutative and test * bench * changelog * remove redundant assignments * improve comments * [stableswap]: Cap number of assets and post-scaled asset amounts to ensure pools never overflow (osmosis-labs#3055) * add tests for 10-asset pools with 10B per asset * add max post-scaled asset check and create pool tests * add sanity tests for new swap guardrails * move max scaled asset amt to constant * add join-pool-internal tests for new functionality * Remove unused versions in mergify (osmosis-labs#3121) * Query lockup params (osmosis-labs#3098) * change proto * add grpc & cli query * test * set params in genesis * add test case: setParams & query * CI: Delete failing step (osmosis-labs#3124) * Delete failing step * Fix int overflow in test logic * [x/gamm][stableswap]: Add inverse join/exit tests, fix single asset join bug, and remove uneven ratio joins (osmosis-labs#3102) * add tests for 10-asset pools with 10B per asset * add max post-scaled asset check and create pool tests * add sanity tests for new swap guardrails * move max scaled asset amt to constant * add join-pool-internal tests for new functionality * fix single join bug, remove uneven ratio joins, and add inverse join tests * add error checks to single asset joins * fix mistake in test case * remove commented line Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com> Co-authored-by: Dev Ojha <dojha@berkeley.edu> * Stableswap implement JoinPoolNoSwap (osmosis-labs#2942) * ... * add tests and denom validation check * make format Co-authored-by: alpo <yukseloglua@berkeley.edu> Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com> * Make testing suite to ensure queries never alter state (osmosis-labs#3001) * create func to check alter state * add tests * format * Update app/apptesting/test_suite.go Co-authored-by: Roman <roman@osmosis.team> * remove fmt * epochs: try to use Invoke * gamm: use Invoke * incentives: use Invoke * lockup: use Invoke * mint: use Invoke * pool-incentives: use Invoke * superfluid: use Invoke * tokenfactory * txfees * format * fix Co-authored-by: Roman <roman@osmosis.team> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Daniel Farina <contact@nevulas.com> Co-authored-by: JeremyParish69 <95667791+JeremyParish69@users.noreply.github.com> Co-authored-by: Adam Tucker <adam@osmosis.team> Co-authored-by: alpo <62043214+AlpinYukseloglu@users.noreply.github.com> Co-authored-by: Dev Ojha <dojha@berkeley.edu> Co-authored-by: Roman <roman@osmosis.team> Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com> Co-authored-by: Nguyen Thanh Nhan <thanhnhan98qh@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com> Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com> Co-authored-by: alpo <yukseloglua@berkeley.edu>
- Loading branch information
14 people
authored and
committed
Nov 2, 2022
1 parent
38bdd78
commit 9dc0aa4