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.

Sign up for GitHub

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

Jump to bottom

refactor(deps): switch to cosmossdk.io/math from fork math (backport #6238) #6268

Closed
wants to merge 1 commit into from
Closed

refactor(deps): switch to cosmossdk.io/math from fork math (backport #6238) #6268

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 1, 2023

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

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

You are currently cherry-picking commit ca75f4c3.
  (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:   CHANGELOG.md
	modified:   CONTRIBUTING.md
	modified:   app/apptesting/gamm.go
	modified:   app/params/config.go
	modified:   app/upgrades/v15/upgrade_test.go
	modified:   app/upgrades/v16/upgrades_test.go
	modified:   app/upgrades/v17/upgrades.go
	modified:   app/upgrades/v17/upgrades_test.go
	modified:   app/upgrades/v4/upgrade_test.go
	modified:   app/upgrades/v8/incentive_props.go
	modified:   app/upgrades/v9/prop214_test.go
	modified:   cmd/osmosisd/cmd/airdrop.go.history
	modified:   cmd/osmosisd/cmd/balances_from_state_export.go
	modified:   cmd/osmosisd/cmd/genaccounts.go
	modified:   cmd/osmosisd/cmd/stargate-query.go
	modified:   cmd/osmosisd/cmd/testnet.go
	modified:   osmomath/binary_search.go
	modified:   osmomath/binary_search_test.go
	modified:   osmomath/decimal.go
	modified:   osmomath/decimal_test.go
	modified:   osmomath/exp2.go
	modified:   osmomath/exp2_test.go
	modified:   osmomath/export_test.go
	modified:   osmomath/go.mod
	modified:   osmomath/go.sum
	modified:   osmomath/int.go
	modified:   osmomath/int_test.go
	modified:   osmomath/log2_bench_test.go
	modified:   osmomath/math.go
	modified:   osmomath/math_test.go
	modified:   osmomath/pow_bench_test.go
	modified:   osmomath/rounding_direction.go
	modified:   osmomath/rounding_direction_test.go
	new file:   osmomath/sdk_math_alias.go
	modified:   osmomath/sigfig_round.go
	modified:   osmomath/sigfig_round_test.go
	modified:   osmoutils/accum/accum.go
	modified:   osmoutils/accum/accum_helpers.go
	modified:   osmoutils/accum/accum_test.go
	modified:   osmoutils/accum/export_test.go
	modified:   osmoutils/accum/options.go
	modified:   osmoutils/cli_helpers.go
	modified:   osmoutils/coin_helper_test.go
	modified:   osmoutils/errors.go
	modified:   osmoutils/go.mod
	modified:   osmoutils/go.sum
	modified:   osmoutils/osmoassert/assertions.go
	modified:   osmoutils/osmocli/parsers.go
	modified:   osmoutils/osmocli/parsers_test.go
	modified:   osmoutils/store_helper.go
	modified:   osmoutils/store_helper_test.go
	modified:   osmoutils/sumtree/legacy/v101/tree.go
	modified:   osmoutils/sumtree/legacy/v101/tree_test.go
	modified:   osmoutils/sumtree/node.go
	modified:   osmoutils/sumtree/tree.go
	modified:   osmoutils/sumtree/tree_test.go
	modified:   simulation/simtypes/random/sdkrand.go
	modified:   tests/cl-genesis-positions/convert.go
	modified:   tests/cl-go-client/go.mod
	modified:   tests/cl-go-client/go.sum
	modified:   tests/cl-go-client/main.go
	modified:   tests/ibc-hooks/async_acks_test.go
	modified:   wasmbinding/bindings/msg.go
	modified:   x/concentrated-liquidity/README.md
	modified:   x/concentrated-liquidity/client/cli/tx.go
	modified:   x/concentrated-liquidity/export_test.go
	modified:   x/concentrated-liquidity/fuzz_test.go
	modified:   x/concentrated-liquidity/genesis.go
	modified:   x/concentrated-liquidity/genesis_test.go
	modified:   x/concentrated-liquidity/invariant_test.go
	modified:   x/concentrated-liquidity/keeper_test.go
	modified:   x/concentrated-liquidity/lp.go
	modified:   x/concentrated-liquidity/lp_test.go
	modified:   x/concentrated-liquidity/math/math.go
	modified:   x/concentrated-liquidity/math/math_test.go
	modified:   x/concentrated-liquidity/math/tick.go
	modified:   x/concentrated-liquidity/math/tick_test.go
	modified:   x/concentrated-liquidity/model/pool.go
	modified:   x/concentrated-liquidity/model/pool_test.go
	modified:   x/concentrated-liquidity/pool.go
	modified:   x/concentrated-liquidity/pool_test.go
	modified:   x/concentrated-liquidity/position.go
	modified:   x/concentrated-liquidity/position_test.go
	modified:   x/concentrated-liquidity/query.go
	modified:   x/concentrated-liquidity/query_test.go
	modified:   x/concentrated-liquidity/range_test.go
	modified:   x/concentrated-liquidity/spread_rewards.go
	modified:   x/concentrated-liquidity/spread_rewards_test.go
	modified:   x/concentrated-liquidity/swaps.go
	modified:   x/concentrated-liquidity/swaps_test.go
	modified:   x/concentrated-liquidity/swaps_tick_cross_test.go
	modified:   x/concentrated-liquidity/swapstrategy/export_test.go
	modified:   x/concentrated-liquidity/swapstrategy/one_for_zero.go
	modified:   x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
	modified:   x/concentrated-liquidity/swapstrategy/spread_rewards.go
	modified:   x/concentrated-liquidity/swapstrategy/spread_rewards_test.go
	modified:   x/concentrated-liquidity/swapstrategy/swap_strategy.go
	modified:   x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
	modified:   x/concentrated-liquidity/swapstrategy/zero_for_one.go
	modified:   x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
	modified:   x/concentrated-liquidity/tick.go
	modified:   x/concentrated-liquidity/tick_test.go
	modified:   x/concentrated-liquidity/types/cl.go
	modified:   x/concentrated-liquidity/types/cl_pool_extensionI.go
	modified:   x/concentrated-liquidity/types/constants.go
	modified:   x/concentrated-liquidity/types/errors.go
	modified:   x/concentrated-liquidity/types/gov.go
	modified:   x/concentrated-liquidity/types/msgs.go
	modified:   x/concentrated-liquidity/types/params.go
	modified:   x/cosmwasmpool/cosmwasm/msg/module_query_msg.go
	modified:   x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.go
	modified:   x/cosmwasmpool/model/pool.go
	modified:   x/cosmwasmpool/pool_module.go
	modified:   x/cosmwasmpool/types/errors.go
	modified:   x/epochs/go.mod
	modified:   x/epochs/go.sum
	modified:   x/gamm/README.md
	modified:   x/gamm/client/cli/cli_test.go
	modified:   x/gamm/client/cli/flags.go
	modified:   x/gamm/client/cli/tx.go
	modified:   x/gamm/keeper/migrate.go
	modified:   x/gamm/keeper/migrate_test.go
	modified:   x/gamm/keeper/pool_service.go
	modified:   x/gamm/keeper/pool_service_test.go
	modified:   x/gamm/pool-models/balancer/amm.go
	modified:   x/gamm/pool-models/balancer/constants.go
	modified:   x/gamm/pool-models/balancer/export_test.go
	modified:   x/gamm/pool-models/balancer/marshal.go
	modified:   x/gamm/pool-models/balancer/pool_suite_test.go
	modified:   x/gamm/pool-models/balancer/pool_test.go
	modified:   x/gamm/pool-models/balancer/util_test.go
	modified:   x/gamm/pool-models/internal/cfmm_common/lp.go
	modified:   x/gamm/pool-models/internal/test_helpers/test_helpers.go
	modified:   x/gamm/pool-models/stableswap/README.md
	modified:   x/gamm/pool-models/stableswap/amm.go
	modified:   x/gamm/pool-models/stableswap/amm_test.go
	modified:   x/gamm/pool-models/stableswap/pool.go
	modified:   x/gamm/pool-models/stableswap/pool_test.go
	modified:   x/gamm/types/constants.go
	modified:   x/gamm/types/hooks.go
	modified:   x/ibc-hooks/go.mod
	modified:   x/ibc-hooks/go.sum
	modified:   x/ibc-hooks/wasm_hook.go
	modified:   x/lockup/client/cli/query.go
	modified:   x/lockup/types/lock.go
	modified:   x/mint/README.md
	modified:   x/mint/keeper/genesis_test.go
	modified:   x/mint/keeper/hooks_test.go
	modified:   x/mint/keeper/keeper.go
	modified:   x/mint/keeper/keeper_test.go
	modified:   x/mint/types/expected_keepers.go
	modified:   x/mint/types/minter.go
	modified:   x/mint/types/params.go
	modified:   x/pool-incentives/keeper/distr.go
	modified:   x/pool-incentives/types/genesis.go
	modified:   x/poolmanager/README.md
	modified:   x/poolmanager/client/cli/cli_test.go
	modified:   x/poolmanager/types/errors.go
	modified:   x/poolmanager/types/pool.go
	modified:   x/poolmanager/types/routes_test.go
	modified:   x/protorev/keeper/epoch_hook.go
	modified:   x/protorev/keeper/posthandler.go
	modified:   x/protorev/types/constants.go
	modified:   x/protorev/types/genesis.go
	modified:   x/protorev/types/token_pair_arb_routes.go
	modified:   x/protorev/types/validate.go
	modified:   x/superfluid/README.md
	modified:   x/superfluid/client/cli/tx.go
	modified:   x/superfluid/keeper/concentrated_liquidity_test.go
	modified:   x/superfluid/keeper/grpc_query_test.go
	modified:   x/superfluid/keeper/migrate_test.go
	modified:   x/superfluid/keeper/slash.go
	modified:   x/superfluid/keeper/slash_test.go
	modified:   x/superfluid/keeper/stake.go
	modified:   x/superfluid/keeper/superfluid_asset.go
	modified:   x/superfluid/types/msgs.go
	modified:   x/superfluid/types/params.go
	modified:   x/tokenfactory/simulation/sim_msgs.go
	modified:   x/tokenfactory/types/msgs.go
	modified:   x/twap/README.md
	modified:   x/twap/api_test.go
	modified:   x/twap/export_test.go
	modified:   x/twap/keeper_test.go
	modified:   x/twap/listeners_test.go
	modified:   x/twap/logic.go
	modified:   x/twap/logic_test.go
	modified:   x/twap/strategy.go
	modified:   x/twap/strategy_test.go
	modified:   x/twap/types/expected_interfaces.go
	modified:   x/twap/types/genesis_test.go
	modified:   x/twap/types/keys.go
	modified:   x/twap/types/keys_test.go
	modified:   x/twap/types/utils.go
	modified:   x/txfees/types/constants.go
	modified:   x/txfees/types/options.go
	modified:   x/valset-pref/README.md
	modified:   x/valset-pref/types/msgs.go
	modified:   x/valset-pref/validator_set.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   app/apptesting/concentrated_liquidity.go
	both modified:   app/apptesting/pool_manager.go
	both modified:   app/apptesting/test_suite.go
	both modified:   app/upgrades/v16/upgrades.go
	both modified:   app/upgrades/v17/constants.go
	both modified:   app/upgrades/v18/upgrades_test.go
	deleted by us:   app/upgrades/v19/upgrades.go
	deleted by us:   app/upgrades/v19/upgrades_test.go
	both modified:   app/upgrades/v3/forks.go
	both modified:   app/upgrades/v9/prop214.go
	both modified:   cmd/osmosisd/cmd/genesis.go
	both modified:   cmd/osmosisd/cmd/root.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/sqrt.go
	deleted by us:   osmomath/sqrt_big_test.go
	both modified:   osmomath/sqrt_test.go
	both modified:   osmoutils/osmocli/dynamic_test.go
	both modified:   simulation/simtypes/randutil.go
	both modified:   tests/cl-genesis-positions/go.mod
	both modified:   tests/cl-genesis-positions/go.sum
	both modified:   tests/e2e/configurer/chain/chain.go
	both modified:   tests/e2e/configurer/chain/commands.go
	both modified:   tests/e2e/configurer/chain/queries.go
	both modified:   tests/e2e/configurer/upgrade.go
	both modified:   tests/e2e/containers/containers.go
	both modified:   tests/e2e/e2e_test.go
	both modified:   tests/e2e/helpers_e2e_test.go
	both modified:   tests/e2e/initialization/config.go
	both modified:   tests/e2e/initialization/node.go
	both modified:   tests/ibc-hooks/ibc_middleware_test.go
	both modified:   tests/ibc-hooks/path_validation_test.go
	both modified:   tests/ibc-hooks/xcs_cw20_test.go
	both modified:   tests/simulator/sim_test.go
	both modified:   tests/simulator/state.go
	both modified:   wasmbinding/query_plugin_test.go
	both modified:   wasmbinding/test/custom_msg_test.go
	both modified:   wasmbinding/test/helpers_test.go
	both modified:   wasmbinding/test/messages_test.go
	both modified:   x/concentrated-liquidity/bench_test.go
	both modified:   x/concentrated-liquidity/client/query_proto_wrap.go
	both modified:   x/concentrated-liquidity/event.go
	both modified:   x/concentrated-liquidity/incentives.go
	both modified:   x/concentrated-liquidity/incentives_test.go
	both modified:   x/concentrated-liquidity/math/precompute.go
	both modified:   x/concentrated-liquidity/model/msgs.go
	both modified:   x/concentrated-liquidity/model/msgs_test.go
	both modified:   x/concentrated-liquidity/msg_server.go
	both modified:   x/concentrated-liquidity/msg_server_test.go
	both modified:   x/concentrated-liquidity/simulation/sim_msgs.go
	both modified:   x/concentrated-liquidity/total_liquidity.go
	both modified:   x/concentrated-liquidity/types/expected_keepers.go
	both modified:   x/concentrated-liquidity/types/gov_test.go
	both modified:   x/concentrated-liquidity/types/msgs_test.go
	both modified:   x/concentrated-liquidity/types/params_test.go
	both modified:   x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go
	both modified:   x/cosmwasmpool/model/pool_test.go
	both modified:   x/cosmwasmpool/model/store_model.go
	both modified:   x/cosmwasmpool/pool_module_test.go
	both modified:   x/gamm/client/cli/query_test.go
	both modified:   x/gamm/client/cli/tx_test.go
	both modified:   x/gamm/keeper/export_test.go
	both modified:   x/gamm/keeper/gas_test.go
	both modified:   x/gamm/keeper/genesis_test.go
	both modified:   x/gamm/keeper/grpc_query.go
	both modified:   x/gamm/keeper/grpc_query_test.go
	both modified:   x/gamm/keeper/keeper_test.go
	both modified:   x/gamm/keeper/msg_server_test.go
	both modified:   x/gamm/keeper/pool.go
	both modified:   x/gamm/keeper/pool_test.go
	both modified:   x/gamm/keeper/share.go
	both modified:   x/gamm/keeper/swap.go
	both modified:   x/gamm/keeper/swap_test.go
	both modified:   x/gamm/keeper/total_liquidity.go
	both modified:   x/gamm/pool-models/balancer/amm_test.go
	both modified:   x/gamm/pool-models/balancer/marshal_test.go
	both modified:   x/gamm/pool-models/balancer/msgs_test.go
	both modified:   x/gamm/pool-models/balancer/pool.go
	both modified:   x/gamm/pool-models/balancer/pool_asset.go
	both modified:   x/gamm/pool-models/balancer/pool_params.go
	both modified:   x/gamm/pool-models/internal/cfmm_common/lp_test.go
	both modified:   x/gamm/pool-models/stableswap/msgs_test.go
	both modified:   x/gamm/pool-models/stableswap/pool_params.go
	both modified:   x/gamm/pool-models/stableswap/util_test.go
	both modified:   x/gamm/simulation/sim_msgs.go
	both modified:   x/gamm/types/expected_keepers.go
	both modified:   x/gamm/types/gov.go
	both modified:   x/gamm/types/msgs_test.go
	both modified:   x/gamm/types/pool.go
	both modified:   x/ibc-rate-limit/ibc_middleware_test.go
	both modified:   x/incentives/client/cli/query_test.go
	both modified:   x/incentives/keeper/distribute.go
	both modified:   x/incentives/keeper/distribute_test.go
	both modified:   x/incentives/keeper/export_test.go
	both modified:   x/incentives/keeper/gauge.go
	both modified:   x/incentives/keeper/gauge_test.go
	both modified:   x/incentives/keeper/grpc_query_test.go
	both modified:   x/incentives/keeper/keeper_test.go
	both modified:   x/incentives/keeper/msg_server_test.go
	both modified:   x/incentives/keeper/store_test.go
	both modified:   x/incentives/simulation/operations.go
	both modified:   x/incentives/types/expected_keepers.go
	both modified:   x/incentives/types/gauge.go
	both modified:   x/incentives/types/msgs_test.go
	both modified:   x/lockup/keeper/bench_test.go
	both modified:   x/lockup/keeper/genesis_test.go
	both modified:   x/lockup/keeper/grpc_query_test.go
	both modified:   x/lockup/keeper/invariants.go
	both modified:   x/lockup/keeper/lock.go
	both modified:   x/lockup/keeper/lock_test.go
	both modified:   x/lockup/keeper/msg_server_test.go
	both modified:   x/lockup/keeper/store.go
	both modified:   x/lockup/types/msgs_test.go
	both modified:   x/mint/keeper/export_test.go
	both modified:   x/mint/keeper/genesis.go
	both modified:   x/mint/simulation/decoder_test.go
	both modified:   x/mint/simulation/genesis.go
	both modified:   x/mint/simulation/genesis_test.go
	both modified:   x/mint/types/minter_test.go
	both modified:   x/mint/types/params_test.go
	both modified:   x/pool-incentives/keeper/distr_test.go
	both modified:   x/pool-incentives/keeper/genesis.go
	both modified:   x/pool-incentives/keeper/genesis_test.go
	both modified:   x/pool-incentives/keeper/grpc_query.go
	both modified:   x/pool-incentives/keeper/grpc_query_test.go
	both modified:   x/pool-incentives/keeper/hooks.go
	both modified:   x/pool-incentives/keeper/keeper_test.go
	both modified:   x/pool-incentives/types/genesis_test.go
	both modified:   x/pool-incentives/types/gov_test.go
	both modified:   x/pool-incentives/types/incentives_test.go
	both modified:   x/pool-incentives/types/record_test.go
	both modified:   x/poolmanager/client/cli/tx.go
	both modified:   x/poolmanager/client/cli/tx_test.go
	both modified:   x/poolmanager/client/testutil/test_helpers.go
	both modified:   x/poolmanager/create_pool_test.go
	both modified:   x/poolmanager/events/emit_test.go
	both modified:   x/poolmanager/export_test.go
	both modified:   x/poolmanager/keeper_test.go
	both modified:   x/poolmanager/msg_server_test.go
	both modified:   x/poolmanager/router.go
	both modified:   x/poolmanager/router_test.go
	deleted by us:   x/poolmanager/taker_fee.go
	deleted by us:   x/poolmanager/types/expected_keepers.go
	deleted by us:   x/poolmanager/types/gov_test.go
	both modified:   x/poolmanager/types/msgs_test.go
	both modified:   x/poolmanager/types/params.go
	both modified:   x/protorev/client/cli/utils.go
	both modified:   x/protorev/keeper/developer_fees.go
	both modified:   x/protorev/keeper/developer_fees_test.go
	both modified:   x/protorev/keeper/emit.go
	both modified:   x/protorev/keeper/emit_test.go
	both modified:   x/protorev/keeper/epoch_hook_test.go
	both modified:   x/protorev/keeper/grpc_query_test.go
	both modified:   x/protorev/keeper/hooks.go
	both modified:   x/protorev/keeper/hooks_test.go
	both modified:   x/protorev/keeper/keeper_test.go
	both modified:   x/protorev/keeper/msg_server_test.go
	both modified:   x/protorev/keeper/posthandler_test.go
	both modified:   x/protorev/keeper/protorev_test.go
	both modified:   x/protorev/keeper/rebalance.go
	both modified:   x/protorev/keeper/rebalance_test.go
	both modified:   x/protorev/keeper/routes.go
	both modified:   x/protorev/keeper/routes_test.go
	both modified:   x/protorev/keeper/statistics.go
	both modified:   x/protorev/keeper/statistics_test.go
	both modified:   x/protorev/types/expected_keepers.go
	both modified:   x/protorev/types/msg_test.go
	both modified:   x/superfluid/client/cli/query_test.go
	both modified:   x/superfluid/keeper/concentrated_liquidity.go
	both modified:   x/superfluid/keeper/edge_case_test.go
	both modified:   x/superfluid/keeper/epoch.go
	both modified:   x/superfluid/keeper/epoch_test.go
	both modified:   x/superfluid/keeper/export_test.go
	both modified:   x/superfluid/keeper/genesis_test.go
	both modified:   x/superfluid/keeper/gov/gov_test.go
	both modified:   x/superfluid/keeper/grpc_query.go
	both modified:   x/superfluid/keeper/hooks.go
	both modified:   x/superfluid/keeper/hooks_test.go
	both modified:   x/superfluid/keeper/intermediary_account_test.go
	both modified:   x/superfluid/keeper/internal/events/emit_test.go
	both modified:   x/superfluid/keeper/invariants.go
	both modified:   x/superfluid/keeper/keeper_test.go
	both modified:   x/superfluid/keeper/msg_server_test.go
	both modified:   x/superfluid/keeper/stake_test.go
	both modified:   x/superfluid/keeper/superfluid_asset_test.go
	both modified:   x/superfluid/keeper/twap_price.go
	both modified:   x/superfluid/keeper/twap_price_test.go
	both modified:   x/superfluid/keeper/unpool_test.go
	both modified:   x/superfluid/simulation/genesis.go
	both modified:   x/superfluid/types/errors.go
	both modified:   x/superfluid/types/expected_keepers.go
	both modified:   x/superfluid/types/msg_test.go
	both modified:   x/tokenfactory/keeper/createdenom_test.go
	both modified:   x/tokenfactory/module.go
	both modified:   x/tokenfactory/types/msgs_test.go
	both modified:   x/twap/api.go
	both modified:   x/twap/client/query_proto_wrap_test.go
	both modified:   x/twap/listeners.go
	both modified:   x/twap/migrate_test.go
	both modified:   x/twap/store_test.go
	both modified:   x/twap/types/twapmock/amminterface.go
	both modified:   x/txfees/keeper/feedecorator.go
	both modified:   x/txfees/keeper/feedecorator_test.go
	both modified:   x/txfees/keeper/feetokens.go
	both modified:   x/txfees/keeper/hooks.go
	both modified:   x/txfees/keeper/hooks_test.go
	both modified:   x/txfees/keeper/keeper_test.go
	both modified:   x/txfees/types/expected_keepers.go
	both modified:   x/valset-pref/client/cli/query_test.go
	both modified:   x/valset-pref/export_test.go
	both modified:   x/valset-pref/keeper.go
	both modified:   x/valset-pref/keeper_test.go
	both modified:   x/valset-pref/msg_server_test.go
	both modified:   x/valset-pref/simulation/sim_msgs.go
	both modified:   x/valset-pref/types/expected_interfaces.go
	both modified:   x/valset-pref/types/msgs_test.go
	both modified:   x/valset-pref/validator_set_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

@p0mvn @mergify
refactor(deps): switch to cosmossdk.io/math from fork math (#6238)
742a010 
* refactor(deps): switch to cosmossdk.io/math from fork math

* switch remaining things

* updates

(cherry picked from commit ca75f4c)

# Conflicts:
#	app/apptesting/concentrated_liquidity.go
#	app/apptesting/pool_manager.go
#	app/apptesting/test_suite.go
#	app/upgrades/v16/upgrades.go
#	app/upgrades/v17/constants.go
#	app/upgrades/v18/upgrades_test.go
#	app/upgrades/v19/upgrades.go
#	app/upgrades/v19/upgrades_test.go
#	app/upgrades/v3/forks.go
#	app/upgrades/v9/prop214.go
#	cmd/osmosisd/cmd/genesis.go
#	cmd/osmosisd/cmd/root.go
#	go.mod
#	go.sum
#	osmomath/sqrt.go
#	osmomath/sqrt_big_test.go
#	osmomath/sqrt_test.go
#	osmoutils/osmocli/dynamic_test.go
#	simulation/simtypes/randutil.go
#	tests/cl-genesis-positions/go.mod
#	tests/cl-genesis-positions/go.sum
#	tests/e2e/configurer/chain/chain.go
#	tests/e2e/configurer/chain/commands.go
#	tests/e2e/configurer/chain/queries.go
#	tests/e2e/configurer/upgrade.go
#	tests/e2e/containers/containers.go
#	tests/e2e/e2e_test.go
#	tests/e2e/helpers_e2e_test.go
#	tests/e2e/initialization/config.go
#	tests/e2e/initialization/node.go
#	tests/ibc-hooks/ibc_middleware_test.go
#	tests/ibc-hooks/path_validation_test.go
#	tests/ibc-hooks/xcs_cw20_test.go
#	tests/simulator/sim_test.go
#	tests/simulator/state.go
#	wasmbinding/query_plugin_test.go
#	wasmbinding/test/custom_msg_test.go
#	wasmbinding/test/helpers_test.go
#	wasmbinding/test/messages_test.go
#	x/concentrated-liquidity/bench_test.go
#	x/concentrated-liquidity/client/query_proto_wrap.go
#	x/concentrated-liquidity/event.go
#	x/concentrated-liquidity/incentives.go
#	x/concentrated-liquidity/incentives_test.go
#	x/concentrated-liquidity/math/precompute.go
#	x/concentrated-liquidity/model/msgs.go
#	x/concentrated-liquidity/model/msgs_test.go
#	x/concentrated-liquidity/msg_server.go
#	x/concentrated-liquidity/msg_server_test.go
#	x/concentrated-liquidity/simulation/sim_msgs.go
#	x/concentrated-liquidity/total_liquidity.go
#	x/concentrated-liquidity/types/expected_keepers.go
#	x/concentrated-liquidity/types/gov_test.go
#	x/concentrated-liquidity/types/msgs_test.go
#	x/concentrated-liquidity/types/params_test.go
#	x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go
#	x/cosmwasmpool/model/pool_test.go
#	x/cosmwasmpool/model/store_model.go
#	x/cosmwasmpool/pool_module_test.go
#	x/gamm/client/cli/query_test.go
#	x/gamm/client/cli/tx_test.go
#	x/gamm/keeper/export_test.go
#	x/gamm/keeper/gas_test.go
#	x/gamm/keeper/genesis_test.go
#	x/gamm/keeper/grpc_query.go
#	x/gamm/keeper/grpc_query_test.go
#	x/gamm/keeper/keeper_test.go
#	x/gamm/keeper/msg_server_test.go
#	x/gamm/keeper/pool.go
#	x/gamm/keeper/pool_test.go
#	x/gamm/keeper/share.go
#	x/gamm/keeper/swap.go
#	x/gamm/keeper/swap_test.go
#	x/gamm/keeper/total_liquidity.go
#	x/gamm/pool-models/balancer/amm_test.go
#	x/gamm/pool-models/balancer/marshal_test.go
#	x/gamm/pool-models/balancer/msgs_test.go
#	x/gamm/pool-models/balancer/pool.go
#	x/gamm/pool-models/balancer/pool_asset.go
#	x/gamm/pool-models/balancer/pool_params.go
#	x/gamm/pool-models/internal/cfmm_common/lp_test.go
#	x/gamm/pool-models/stableswap/msgs_test.go
#	x/gamm/pool-models/stableswap/pool_params.go
#	x/gamm/pool-models/stableswap/util_test.go
#	x/gamm/simulation/sim_msgs.go
#	x/gamm/types/expected_keepers.go
#	x/gamm/types/gov.go
#	x/gamm/types/msgs_test.go
#	x/gamm/types/pool.go
#	x/ibc-rate-limit/ibc_middleware_test.go
#	x/incentives/client/cli/query_test.go
#	x/incentives/keeper/distribute.go
#	x/incentives/keeper/distribute_test.go
#	x/incentives/keeper/export_test.go
#	x/incentives/keeper/gauge.go
#	x/incentives/keeper/gauge_test.go
#	x/incentives/keeper/grpc_query_test.go
#	x/incentives/keeper/keeper_test.go
#	x/incentives/keeper/msg_server_test.go
#	x/incentives/keeper/store_test.go
#	x/incentives/simulation/operations.go
#	x/incentives/types/expected_keepers.go
#	x/incentives/types/gauge.go
#	x/incentives/types/msgs_test.go
#	x/lockup/keeper/bench_test.go
#	x/lockup/keeper/genesis_test.go
#	x/lockup/keeper/grpc_query_test.go
#	x/lockup/keeper/invariants.go
#	x/lockup/keeper/lock.go
#	x/lockup/keeper/lock_test.go
#	x/lockup/keeper/msg_server_test.go
#	x/lockup/keeper/store.go
#	x/lockup/types/msgs_test.go
#	x/mint/keeper/export_test.go
#	x/mint/keeper/genesis.go
#	x/mint/simulation/decoder_test.go
#	x/mint/simulation/genesis.go
#	x/mint/simulation/genesis_test.go
#	x/mint/types/minter_test.go
#	x/mint/types/params_test.go
#	x/pool-incentives/keeper/distr_test.go
#	x/pool-incentives/keeper/genesis.go
#	x/pool-incentives/keeper/genesis_test.go
#	x/pool-incentives/keeper/grpc_query.go
#	x/pool-incentives/keeper/grpc_query_test.go
#	x/pool-incentives/keeper/hooks.go
#	x/pool-incentives/keeper/keeper_test.go
#	x/pool-incentives/types/genesis_test.go
#	x/pool-incentives/types/gov_test.go
#	x/pool-incentives/types/incentives_test.go
#	x/pool-incentives/types/record_test.go
#	x/poolmanager/client/cli/tx.go
#	x/poolmanager/client/cli/tx_test.go
#	x/poolmanager/client/testutil/test_helpers.go
#	x/poolmanager/create_pool_test.go
#	x/poolmanager/events/emit_test.go
#	x/poolmanager/export_test.go
#	x/poolmanager/keeper_test.go
#	x/poolmanager/msg_server_test.go
#	x/poolmanager/router.go
#	x/poolmanager/router_test.go
#	x/poolmanager/taker_fee.go
#	x/poolmanager/types/expected_keepers.go
#	x/poolmanager/types/gov_test.go
#	x/poolmanager/types/msgs_test.go
#	x/poolmanager/types/params.go
#	x/protorev/client/cli/utils.go
#	x/protorev/keeper/developer_fees.go
#	x/protorev/keeper/developer_fees_test.go
#	x/protorev/keeper/emit.go
#	x/protorev/keeper/emit_test.go
#	x/protorev/keeper/epoch_hook_test.go
#	x/protorev/keeper/grpc_query_test.go
#	x/protorev/keeper/hooks.go
#	x/protorev/keeper/hooks_test.go
#	x/protorev/keeper/keeper_test.go
#	x/protorev/keeper/msg_server_test.go
#	x/protorev/keeper/posthandler_test.go
#	x/protorev/keeper/protorev_test.go
#	x/protorev/keeper/rebalance.go
#	x/protorev/keeper/rebalance_test.go
#	x/protorev/keeper/routes.go
#	x/protorev/keeper/routes_test.go
#	x/protorev/keeper/statistics.go
#	x/protorev/keeper/statistics_test.go
#	x/protorev/types/expected_keepers.go
#	x/protorev/types/msg_test.go
#	x/superfluid/client/cli/query_test.go
#	x/superfluid/keeper/concentrated_liquidity.go
#	x/superfluid/keeper/edge_case_test.go
#	x/superfluid/keeper/epoch.go
#	x/superfluid/keeper/epoch_test.go
#	x/superfluid/keeper/export_test.go
#	x/superfluid/keeper/genesis_test.go
#	x/superfluid/keeper/gov/gov_test.go
#	x/superfluid/keeper/grpc_query.go
#	x/superfluid/keeper/hooks.go
#	x/superfluid/keeper/hooks_test.go
#	x/superfluid/keeper/intermediary_account_test.go
#	x/superfluid/keeper/internal/events/emit_test.go
#	x/superfluid/keeper/invariants.go
#	x/superfluid/keeper/keeper_test.go
#	x/superfluid/keeper/msg_server_test.go
#	x/superfluid/keeper/stake_test.go
#	x/superfluid/keeper/superfluid_asset_test.go
#	x/superfluid/keeper/twap_price.go
#	x/superfluid/keeper/twap_price_test.go
#	x/superfluid/keeper/unpool_test.go
#	x/superfluid/simulation/genesis.go
#	x/superfluid/types/errors.go
#	x/superfluid/types/expected_keepers.go
#	x/superfluid/types/msg_test.go
#	x/tokenfactory/keeper/createdenom_test.go
#	x/tokenfactory/module.go
#	x/tokenfactory/types/msgs_test.go
#	x/twap/api.go
#	x/twap/client/query_proto_wrap_test.go
#	x/twap/listeners.go
#	x/twap/migrate_test.go
#	x/twap/store_test.go
#	x/twap/types/twapmock/amminterface.go
#	x/txfees/keeper/feedecorator.go
#	x/txfees/keeper/feedecorator_test.go
#	x/txfees/keeper/feetokens.go
#	x/txfees/keeper/hooks.go
#	x/txfees/keeper/hooks_test.go
#	x/txfees/keeper/keeper_test.go
#	x/txfees/types/expected_keepers.go
#	x/valset-pref/client/cli/query_test.go
#	x/valset-pref/export_test.go
#	x/valset-pref/keeper.go
#	x/valset-pref/keeper_test.go
#	x/valset-pref/msg_server_test.go
#	x/valset-pref/simulation/sim_msgs.go
#	x/valset-pref/types/expected_interfaces.go
#	x/valset-pref/types/msgs_test.go
#	x/valset-pref/validator_set_test.go
@mergify mergify bot added the conflicts label Sep 1, 2023
@mergify mergify bot assigned p0mvn Sep 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2023

Important Notice

This PR includes modifications to the tests/e2e/initialization module.
Please follow the instructions below:

  1. Backport these changes to the previous Osmosis version's branch.
  2. Run the script inside a Docker container to update genesis and configs for pre-upgrade Osmosis.
  3. Merge the backported changes.
  4. The image will be built and uploaded to Docker Hub here.
  5. Grab the latest image and update it in the PR to the main branch replacing the previousVersionInitTag in the osmosis/tests/e2e/containers/config.go

Please let us know if you need any help.

@github-actions github-actions bot added C:docs Improvements or additions to documentation C:x/lockup C:CLI C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint C:x/incentives C:x/epochs C:x/pool-incentives C:x/superfluid C:x/txfees C:app-wiring Changes to the app folder C:x/tokenfactory C:simulator Edits simulator or simulations C:x/twap Changes to the twap module C:x/concentrated-liquidity C:x/poolmanager labels Sep 1, 2023
@p0mvn p0mvn closed this Sep 1, 2023
@mergify mergify bot deleted the mergify/bp/v18.x/pr-6238 branch September 1, 2023 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattverse mattverse Awaiting requested review from mattverse mattverse is a code owner

@stackman27 stackman27 Awaiting requested review from stackman27

@nicolaslara nicolaslara Awaiting requested review from nicolaslara nicolaslara is a code owner

@p0mvn p0mvn Awaiting requested review from p0mvn p0mvn is a code owner

@AlpinYukseloglu AlpinYukseloglu Awaiting requested review from AlpinYukseloglu AlpinYukseloglu is a code owner

@czarcas7ic czarcas7ic Awaiting requested review from czarcas7ic czarcas7ic is a code owner

Assignees

@p0mvn p0mvn

Labels
C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:simulator Edits simulator or simulations C:x/concentrated-liquidity C:x/epochs C:x/gamm Changes, features and bugs related to the gamm module. C:x/incentives C:x/lockup C:x/mint C:x/pool-incentives C:x/poolmanager C:x/superfluid C:x/tokenfactory C:x/twap Changes to the twap module C:x/txfees conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@p0mvn