diff --git a/CHANGELOG.md b/CHANGELOG.md index 549fcf0ab8c..d7d26e04793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,218 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +<<<<<<< HEAD +======= +### State Breaking + +* [#7181](https://github.com/osmosis-labs/osmosis/pull/7181) Improve errors for out of gas + +### Bug Fixes + +* [#7346](https://github.com/osmosis-labs/osmosis/pull/7346) Prevent heavy gRPC load from app hashing nodes + +## v22.0.0 + +### Fee Market Parameter Updates +* [#7285](https://github.com/osmosis-labs/osmosis/pull/7285) The following updates are applied: + * Dynamic recheck factor based on current base fee value. Under 0.01, the recheck factor is 3. + In face of continuous spam, will take ~19 blocks from base fee > spam cost, to mempool eviction. + Above 0.01, the recheck factor is 2.3. In face of continuous spam, will take ~15 blocks from base fee > spam cost, to mempool eviction. + * Reset interval set to 6000 which is approximately 8.5 hours. + * Default base fee is reduced by 2 to 0.005. + * Set target gas to .625 * block_gas_limt = 187.5 million + +### State Breaking + +### API +* [#6991](https://github.com/osmosis-labs/osmosis/pull/6991) Fix: total liquidity poolmanager grpc gateway query +* [#7237](https://github.com/osmosis-labs/osmosis/pull/7237) Removes tx_fee_tracker from the proto rev tracker, no longer tracks in state. +* [#7240](https://github.com/osmosis-labs/osmosis/pull/7240) Protorev tracker now tracks a coin array to improve gas efficiency. + +### Features +* [#6847](https://github.com/osmosis-labs/osmosis/pull/6847) feat: allow sending denoms with URL encoding +* [#7270](https://github.com/osmosis-labs/osmosis/pull/7270) feat: eip target gas from consensus params + +### Bug Fixes +* [#7120](https://github.com/osmosis-labs/osmosis/pull/7120) fix: remove duplicate `query gamm pool` subcommand +* [#7139](https://github.com/osmosis-labs/osmosis/pull/7139) fix: add amino signing support to tokenfactory messages +* [#7245](https://github.com/osmosis-labs/osmosis/pull/7245) fix: correcting json tag value for `SwapAmountOutSplitRouteWrapper.OutDenom` +* [#7267](https://github.com/osmosis-labs/osmosis/pull/7267) fix: support CL pools in tx fee module +* [#7220](https://github.com/osmosis-labs/osmosis/pull/7220) Register consensus params; Set MaxGas to 300m and MaxBytes to 5mb. +* [#7300](https://github.com/osmosis-labs/osmosis/pull/7300) fix: update wasm vm as per CWA-2023-004 + +### Misc Improvements +* [#6993](https://github.com/osmosis-labs/osmosis/pull/6993) chore: add mutative api for BigDec.BigInt() +* [#7074](https://github.com/osmosis-labs/osmosis/pull/7074) perf: don't load all poolmanager params every swap +* [#7243](https://github.com/osmosis-labs/osmosis/pull/7243) chore: update gov metadata length from 256 to 10200 +* [#7258](https://github.com/osmosis-labs/osmosis/pull/7258) Remove an iterator call in CL swaps and spot price calls. +* [#7259](https://github.com/osmosis-labs/osmosis/pull/7259) Lower gas and CPU overhead of chargeTakerFee (in every swap) +* [#7249](https://github.com/osmosis-labs/osmosis/pull/7249) Double auth tx size cost per byte from 10 to 20 +* [#7272](https://github.com/osmosis-labs/osmosis/pull/7272) Upgrade go 1.20 -> 1.21 +* [#7282](https://github.com/osmosis-labs/osmosis/pull/7282) perf:Update sdk fork to no longer utilize reverse denom mapping, reducing gas costs. +* [#7203](https://github.com/osmosis-labs/osmosis/pull/7203) Make a maximum number of pools of 100 billion. +* [#7282](https://github.com/osmosis-labs/osmosis/pull/7282) Update sdk fork to no longer utilize reverse denom mapping, reducing gas costs. +* [#7291](https://github.com/osmosis-labs/osmosis/pull/7291) Raise mempool config's default max gas per tx configs. + +## v21.2.2 +### Features +* [#7238](https://github.com/osmosis-labs/osmosis/pull/7238) re-add clawback vesting command +* [#7253](https://github.com/osmosis-labs/osmosis/pull/7253) feat: extended app hash logs + + +### Bug Fixes +* [#7233](https://github.com/osmosis-labs/osmosis/pull/7233) fix: config overwrite ignores app.toml values +* [#7246](https://github.com/osmosis-labs/osmosis/pull/7246) fix: config overwrite fails with exit code 1 if wrong permissions + +### Misc Improvements +* [#7254](https://github.com/osmosis-labs/osmosis/pull/7254) chore: remove cl test modules +* [#7269](https://github.com/osmosis-labs/osmosis/pull/7269) chore: go mod dependency updates +* [#7126](https://github.com/osmosis-labs/osmosis/pull/7126) refactor: using coins.Denoms() from sdk instead of osmoutils +* [#7127](https://github.com/osmosis-labs/osmosis/pull/7127) refactor: replace MinCoins with sdk coins.Min() +* [#7214](https://github.com/osmosis-labs/osmosis/pull/7214) Speedup more stable swap math operations + +## v21.2.1 + +* [#7233](https://github.com/osmosis-labs/osmosis/pull/7233) fix: config overwrite ignores app.toml values + +## v21.1.5 + +* [#7210](https://github.com/osmosis-labs/osmosis/pull/7210) Arb filter for new authz exec swap. + +## v21.1.4 + +* [#7180](https://github.com/osmosis-labs/osmosis/pull/7180) Change `consensus.timeout-commit` from 5s to 4s in `config.toml`. Overwrites the existing value on start-up. Default is set to 4s. + +## v21.1.3 + +Epoch and CPU time optimizations + +* [#7093](https://github.com/osmosis-labs/osmosis/pull/7093),[#7100](https://github.com/osmosis-labs/osmosis/pull/7100),[#7172](https://github.com/osmosis-labs/osmosis/pull/7172),[#7174](https://github.com/osmosis-labs/osmosis/pull/7174),[#7186](https://github.com/osmosis-labs/osmosis/pull/7186), [#7192](https://github.com/osmosis-labs/osmosis/pull/7192) Lower CPU overheads of the Osmosis epoch. +* [#7106](https://github.com/osmosis-labs/osmosis/pull/7106) Halve the time of log2 calculation (speeds up TWAP code) + + +## v21.1.2 + +* [#7170](https://github.com/osmosis-labs/osmosis/pull/7170) Update mempool-eip1559 params to cause less base fee spikes on mainnet. +* [#7093](https://github.com/osmosis-labs/osmosis/pull/7093),[#7100](https://github.com/osmosis-labs/osmosis/pull/7100),[#7172](https://github.com/osmosis-labs/osmosis/pull/7172),[#7174](https://github.com/osmosis-labs/osmosis/pull/7174),[#7186](https://github.com/osmosis-labs/osmosis/pull/7186), [#7192](https://github.com/osmosis-labs/osmosis/pull/7186) Lower CPU overheads of the Osmosis epoch. +* [#7106](https://github.com/osmosis-labs/osmosis/pull/7106) Halve the time of log2 calculation (speeds up TWAP code) + +## v21.1.1 + +Epoch optimizations are in this release, see a subset of PR links in v21.1.3 section. + +### Bug Fixes + +* [#7209](https://github.com/osmosis-labs/osmosis/pull/7209) Charge gas on input context when querying cw contracts. + +## v21.0.0 + +### API + +* [#6939](https://github.com/osmosis-labs/osmosis/pull/6939) Fix taker fee GRPC gateway query path in poolmanager. + +### Features + +* [#6804](https://github.com/osmosis-labs/osmosis/pull/6804) feat: track and query protocol rev across all modules +* [#7139](https://github.com/osmosis-labs/osmosis/pull/7139) feat: add amino signing support to tokenfactory messages + +### Fix Localosmosis docker-compose with state. + +* Updated the docker-compose for localosmosis with state to be inline with Operations updated process. + +### State Breaks + +* [#6758](https://github.com/osmosis-labs/osmosis/pull/6758) Add codec for MsgUndelegateFromRebalancedValidatorSet +* [#6836](https://github.com/osmosis-labs/osmosis/pull/6836) Add DenomsMetadata to stargate whitelist and fixs the DenomMetadata response type +* [#6814](https://github.com/osmosis-labs/osmosis/pull/6814) Add EstimateTradeBasedOnPriceImpact to stargate whitelist +* [#6886](https://github.com/osmosis-labs/osmosis/pull/6886) Add Err handling for ABCI Query Route for wasm binded query +* [#6859](https://github.com/osmosis-labs/osmosis/pull/6859) Add hooks to core CL operations (position creation/withdrawal and swaps) +* [#6932](https://github.com/osmosis-labs/osmosis/pull/6932) Allow protorev module to receive tokens +* [#6937](https://github.com/osmosis-labs/osmosis/pull/6937) Update wasmd to v0.45.0 and wasmvm to v1.5.0 +* [#6949](https://github.com/osmosis-labs/osmosis/pull/6949) Valset withdraw rewards now considers all validators user is delegated to instead of valset + +### Misc Improvements + +* [#7147](https://github.com/osmosis-labs/osmosis/pull/7147) Add poolID to collect CL rewards and incentives events. +* [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit. +* [#6858](https://github.com/osmosis-labs/osmosis/pull/6858) Merge mempool improvements from v20 +* [#6861](https://github.com/osmosis-labs/osmosis/pull/6861) Protorev address added to reduced taker fee whitelist +* [#6884](https://github.com/osmosis-labs/osmosis/pull/6884) Improve ListPoolsByDenom function filter denom logic +* [#6890](https://github.com/osmosis-labs/osmosis/pull/6890) Enable arb filter for affiliate swap contract +* [#6884](https://github.com/osmosis-labs/osmosis/pull/6914) Update ListPoolsByDenom function by using pool.GetPoolDenoms to filter denom directly +* [#6959](https://github.com/osmosis-labs/osmosis/pull/6959) Increase high gas threshold to 2m from 1m + +### API Breaks + +* [#6805](https://github.com/osmosis-labs/osmosis/pull/6805) return bucket index of the current tick from LiquidityPerTickRange query +* [#6530](https://github.com/osmosis-labs/osmosis/pull/6530) Improve error message when CL LP fails due to slippage bound hit. + + +### Bug Fixes + +* [#6840](https://github.com/osmosis-labs/osmosis/pull/6840) fix: change TypeMsgUnbondConvertAndStake value to "unbond_convert_and_stake" and improve error message when epoch currentEpochStartHeight less than zero +* [#6769](https://github.com/osmosis-labs/osmosis/pull/6769) fix: improve dust handling in EstimateTradeBasedOnPriceImpact +* [#6841](https://github.com/osmosis-labs/osmosis/pull/6841) fix: fix receive_ack response field and improve error message of InvalidCrosschainSwapsContract and NoDenomTrace + +## v20.4.0 + +### Bug Fixes + +* [#6906](https://github.com/osmosis-labs/osmosis/pull/6906) Fix issue with the affiliate swap contract mempool check. + +### Misc Improvements + +* [#6863](https://github.com/osmosis-labs/osmosis/pull/6863) GetPoolDenoms method on PoolI interface in poolmanager + +## v20.3.0 + +### Configuration Changes + +* [#6897](https://github.com/osmosis-labs/osmosis/pull/6897) Enable 1559 mempool by default. + +## v20.2.2 + +### Features +* [#6890](https://github.com/osmosis-labs/osmosis/pull/6890) Enable arb filter for affiliate swap contract + +### Misc Improvements + +* [#6847](https://github.com/osmosis-labs/osmosis/pull/6847) feat: allow sending denoms with URL encoding +* [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit. + +### API Breaks + +* [#6805](https://github.com/osmosis-labs/osmosis/pull/6805) return bucket index of the current tick from LiquidityPerTickRange query +* [#6863](https://github.com/osmosis-labs/osmosis/pull/6863) GetPoolDenoms method on PoolI interface in poolmanager + +## v20.0.0 + +### Features + +* [#6847](https://github.com/osmosis-labs/osmosis/pull/6847) feat: allow sending denoms with URL encoding +* [#6766](https://github.com/osmosis-labs/osmosis/pull/6766) CLI: Query pool by coin denom +* [#6468](https://github.com/osmosis-labs/osmosis/pull/6468) feat: remove osmo multihop discount +* [#6420](https://github.com/osmosis-labs/osmosis/pull/6420) feat[CL]: Creates a governance set whitelist of addresses that can bypass the normal pool creation restrictions on concentrated liquidity pools +* [#6623](https://github.com/osmosis-labs/osmosis/pull/6420) feat: transfer cl positions to new owner +* [#6632](https://github.com/osmosis-labs/osmosis/pull/6632) Taker fee bypass whitelist +* [#6709](https://github.com/osmosis-labs/osmosis/pull/6709) CLI: Add list-env, all Environment for CLI + +### State Breaking + +* [#6413](https://github.com/osmosis-labs/osmosis/pull/6413) feat: update sdk to v0.47x +* [#6344](https://github.com/osmosis-labs/osmosis/pull/6344) fix: set name, display and symbol of denom metadata in tokenfactory's CreateDenom +* [#6279](https://github.com/osmosis-labs/osmosis/pull/6279) fix prop-597 introduced issue +* [#6282](https://github.com/osmosis-labs/osmosis/pull/6282) Fix CreateCanonicalConcentratedLiquidityPoolAndMigrationLink overriding migration records +* [#6309](https://github.com/osmosis-labs/osmosis/pull/6309) Add Cosmwasm Pool Queries to Stargate Query +* [#6493](https://github.com/osmosis-labs/osmosis/pull/6493) Add PoolManager Params query to Stargate Whitelist +* [#6421](https://github.com/osmosis-labs/osmosis/pull/6421) Moves ValidatePermissionlessPoolCreationEnabled out of poolmanager module +* [#5967](https://github.com/osmosis-labs/osmosis/pull/5967) fix ValSet undelegate API out of sync with existing staking +* [#6627](https://github.com/osmosis-labs/osmosis/pull/6627) Limit pow iterations in osmomath. +* [#6586](https://github.com/osmosis-labs/osmosis/pull/6586) add auth.moduleaccounts to the stargate whitelist +* [#6680](https://github.com/osmosis-labs/osmosis/pull/6680) Add Taker Fee query and add it to stargate whitelist +* [#6699](https://github.com/osmosis-labs/osmosis/pull/6699) fix ValSet undelegate API to work with tokens instead of shares + +>>>>>>> 2caa5c6b (fix(StargateQueries): use a sync pool when unmarshalling responses of protobuf objects (#7346)) ### Bug Fixes * [#6644](https://github.com/osmosis-labs/osmosis/pull/6644) fix: genesis bug in pool incentives linking NoLock gauges and PoolIDs * [#6666](https://github.com/osmosis-labs/osmosis/pull/6666) fix: cosmwasmpool state export bug diff --git a/cmd/osmosisd/cmd/stargate-query.go b/cmd/osmosisd/cmd/stargate-query.go index 99d50c8d593..ce846c70da2 100644 --- a/cmd/osmosisd/cmd/stargate-query.go +++ b/cmd/osmosisd/cmd/stargate-query.go @@ -77,7 +77,7 @@ Example: //nolint:staticcheck func GetStructAndFill(queryPath, module, structName string, structArguments ...string) (interface{}, error) { const ParamRequest = "QueryParamsRequest" - _, err := wasmbinding.GetWhitelistedQuery(queryPath) + err := wasmbinding.IsWhitelistedQuery(queryPath) if err != nil { return nil, err } diff --git a/wasmbinding/export_test.go b/wasmbinding/export_test.go index 537dc1496e3..7cf51e6bf7d 100644 --- a/wasmbinding/export_test.go +++ b/wasmbinding/export_test.go @@ -2,6 +2,10 @@ package wasmbinding import "github.com/cosmos/cosmos-sdk/codec" -func SetWhitelistedQuery(queryPath string, protoType codec.ProtoMarshaler) { +func SetWhitelistedQuery[T any, PT protoTypeG[T]](queryPath string, protoType PT) { setWhitelistedQuery(queryPath, protoType) } + +func GetWhitelistedQuery(queryPath string) (codec.ProtoMarshaler, error) { + return getWhitelistedQuery(queryPath) +} diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index 3e3d202215a..e4851de1efe 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -17,11 +17,15 @@ import ( // StargateQuerier dispatches whitelisted stargate queries func StargateQuerier(queryRouter baseapp.GRPCQueryRouter, cdc codec.Codec) func(ctx sdk.Context, request *wasmvmtypes.StargateQuery) ([]byte, error) { return func(ctx sdk.Context, request *wasmvmtypes.StargateQuery) ([]byte, error) { - protoResponseType, err := GetWhitelistedQuery(request.Path) + protoResponseType, err := getWhitelistedQuery(request.Path) if err != nil { return nil, err } + // no matter what happens after this point, we must return + // the response type to prevent sync.Pool from leaking. + defer returnStargateResponseToPool(request.Path, protoResponseType) + route := queryRouter.Route(request.Path) if route == nil { return nil, wasmvmtypes.UnsupportedRequest{Kind: fmt.Sprintf("No route to query '%s'", request.Path)} diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go index b4c64b0941a..07a2977e86c 100644 --- a/wasmbinding/stargate_whitelist.go +++ b/wasmbinding/stargate_whitelist.go @@ -31,12 +31,13 @@ import ( epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) -// stargateWhitelist keeps whitelist and its deterministic +// stargateResponsePools keeps whitelist and its deterministic // response binding for stargate queries. // -// The query can be multi-thread, so we have to use -// thread safe sync.Map. -var stargateWhitelist sync.Map +// The query is multi-threaded so we're using a sync.Pool +// to manage the allocation and de-allocation of newly created +// pb objects. +var stargateResponsePools = make(map[string]*sync.Pool) // Note: When adding a migration here, we should also add it to the Async ICQ params in the upgrade. // In the future we may want to find a better way to keep these in sync @@ -169,34 +170,57 @@ func init() { setWhitelistedQuery("/osmosis.concentratedliquidity.v1beta1.Query/CFMMPoolIdLinkFromConcentratedPoolId", &concentratedliquidityquery.CFMMPoolIdLinkFromConcentratedPoolIdResponse{}) } -// GetWhitelistedQuery returns the whitelisted query at the provided path. +// IsWhitelistedQuery returns if the query is not whitelisted. +func IsWhitelistedQuery(queryPath string) error { + _, isWhitelisted := stargateResponsePools[queryPath] + if !isWhitelisted { + return wasmvmtypes.UnsupportedRequest{Kind: fmt.Sprintf("'%s' path is not allowed from the contract", queryPath)} + } + return nil +} + +// getWhitelistedQuery returns the whitelisted query at the provided path. // If the query does not exist, or it was setup wrong by the chain, this returns an error. -func GetWhitelistedQuery(queryPath string) (codec.ProtoMarshaler, error) { - protoResponseAny, isWhitelisted := stargateWhitelist.Load(queryPath) +// CONTRACT: must call returnStargateResponseToPool in order to avoid pointless allocs. +func getWhitelistedQuery(queryPath string) (codec.ProtoMarshaler, error) { + protoResponseAny, isWhitelisted := stargateResponsePools[queryPath] if !isWhitelisted { return nil, wasmvmtypes.UnsupportedRequest{Kind: fmt.Sprintf("'%s' path is not allowed from the contract", queryPath)} } - protoResponseType, ok := protoResponseAny.(codec.ProtoMarshaler) + protoMarshaler, ok := protoResponseAny.Get().(codec.ProtoMarshaler) if !ok { - return nil, wasmvmtypes.Unknown{} + return nil, fmt.Errorf("failed to assert type to codec.ProtoMarshaler") } - return protoResponseType, nil + return protoMarshaler, nil } -func setWhitelistedQuery(queryPath string, protoType codec.ProtoMarshaler) { - stargateWhitelist.Store(queryPath, protoType) +type protoTypeG[T any] interface { + *T + codec.ProtoMarshaler +} + +// setWhitelistedQuery sets the whitelisted query at the provided path. +// This method also creates a sync.Pool for the provided protoMarshaler. +// We use generics so we can properly instantiate an object that the +// queryPath expects as a response. +func setWhitelistedQuery[T any, PT protoTypeG[T]](queryPath string, _ PT) { + stargateResponsePools[queryPath] = &sync.Pool{ + New: func() any { + return PT(new(T)) + }, + } +} + +// returnStargateResponseToPool returns the provided protoMarshaler to the appropriate pool based on it's query path. +func returnStargateResponseToPool(queryPath string, pb codec.ProtoMarshaler) { + stargateResponsePools[queryPath].Put(pb) } func GetStargateWhitelistedPaths() (keys []string) { // Iterate over the map and collect the keys - stargateWhitelist.Range(func(key, value interface{}) bool { - keyStr, ok := key.(string) - if !ok { - panic("key is not a string") - } - keys = append(keys, keyStr) - return true - }) - + keys = make([]string, 0, len(stargateResponsePools)) + for k := range stargateResponsePools { + keys = append(keys, k) + } return keys }