From 84107bf3dc4f0adfd554e7064637c79b3695b45f Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Fri, 10 Nov 2023 12:33:20 -0700 Subject: [PATCH 1/2] add protorev to whitelist --- app/upgrades/v21/upgrades.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index 2f6c02608b2..4fe40e795ab 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -167,6 +167,12 @@ func CreateUpgradeHandler( // Set CL param: keepers.ConcentratedLiquidityKeeper.SetParam(ctx, concentratedliquiditytypes.KeyHookGasLimit, concentratedliquiditytypes.DefaultContractHookGasLimit) + // Add protorev to the taker fee exclusion list: + protorevModuleAccount := keepers.AccountKeeper.GetModuleAccount(ctx, protorevtypes.ModuleName) + poolManagerParams := keepers.PoolManagerKeeper.GetParams(ctx) + poolManagerParams.TakerFeeParams.ReducedFeeWhitelist = append(poolManagerParams.TakerFeeParams.ReducedFeeWhitelist, protorevModuleAccount.GetAddress().String()) + keepers.PoolManagerKeeper.SetParams(ctx, poolManagerParams) + // Since we are now tracking all protocol rev, we set the accounting height to the current block height for each module // that generates protocol rev. keepers.PoolManagerKeeper.SetTakerFeeTrackerStartHeight(ctx, ctx.BlockHeight()) From f1aa45f725a992397842807d281c9e655e1733bd Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Fri, 10 Nov 2023 12:36:10 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a61da4f3b..53d92e64a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#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 ### API Breaks