From 457874b2e2ec322660853225e84efd8a3d6a34c3 Mon Sep 17 00:00:00 2001
From: alpo <yukseloglua@berkeley.edu>
Date: Sat, 9 Jul 2022 16:30:55 -0700
Subject: [PATCH 1/7] make SetParams private

---
 x/gamm/keeper/export_test.go | 12 ++++++++++++
 x/gamm/keeper/params.go      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 x/gamm/keeper/export_test.go

diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go
new file mode 100644
index 00000000000..d4ea2fff460
--- /dev/null
+++ b/x/gamm/keeper/export_test.go
@@ -0,0 +1,12 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/osmosis-labs/osmosis/v7/x/gamm/types"
+)
+
+// SetParams sets the total set of params.
+func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
+	k.setParams(ctx, params)
+}
\ No newline at end of file
diff --git a/x/gamm/keeper/params.go b/x/gamm/keeper/params.go
index 5a65da4960a..420c3413e1d 100644
--- a/x/gamm/keeper/params.go
+++ b/x/gamm/keeper/params.go
@@ -13,6 +13,6 @@ func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
 }
 
 // SetParams sets the total set of params.
-func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
+func (k Keeper) setParams(ctx sdk.Context, params types.Params) {
 	k.paramSpace.SetParamSet(ctx, &params)
 }

From 6cc13dd973330e996b5e534cc35c670431854763 Mon Sep 17 00:00:00 2001
From: alpo <yukseloglua@berkeley.edu>
Date: Sat, 9 Jul 2022 16:36:27 -0700
Subject: [PATCH 2/7] make liquidity tracker set fxs private

---
 x/gamm/keeper/genesis.go         |  6 +++---
 x/gamm/keeper/pool.go            |  4 ++--
 x/gamm/keeper/total_liquidity.go | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x/gamm/keeper/genesis.go b/x/gamm/keeper/genesis.go
index bdccb8a4921..2720c8643e5 100644
--- a/x/gamm/keeper/genesis.go
+++ b/x/gamm/keeper/genesis.go
@@ -10,8 +10,8 @@ import (
 // InitGenesis initializes the x/gamm module's state from a provided genesis
 // state, which includes the current live pools, global pool parameters (e.g. pool creation fee), next pool number etc.
 func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState, unpacker codectypes.AnyUnpacker) {
-	k.SetParams(ctx, genState.Params)
-	k.SetNextPoolNumber(ctx, genState.NextPoolNumber)
+	k.setParams(ctx, genState.Params)
+	k.setNextPoolNumber(ctx, genState.NextPoolNumber)
 
 	// Sums up the liquidity in all genesis state pools to find the total liquidity across all pools.
 	// Also adds each genesis state pool to the x/gamm module's state
@@ -33,7 +33,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState, unpack
 		}
 	}
 
-	k.SetTotalLiquidity(ctx, liquidity)
+	k.setTotalLiquidity(ctx, liquidity)
 }
 
 // ExportGenesis returns the capability module's exported genesis.
diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go
index 357d96a293c..89e3e36da8b 100644
--- a/x/gamm/keeper/pool.go
+++ b/x/gamm/keeper/pool.go
@@ -197,7 +197,7 @@ func (k Keeper) DeletePool(ctx sdk.Context, poolId uint64) error {
 // }
 
 // SetNextPoolNumber sets next pool number.
-func (k Keeper) SetNextPoolNumber(ctx sdk.Context, poolNumber uint64) {
+func (k Keeper) setNextPoolNumber(ctx sdk.Context, poolNumber uint64) {
 	store := ctx.KVStore(k.storeKey)
 	bz := k.cdc.MustMarshal(&gogotypes.UInt64Value{Value: poolNumber})
 	store.Set(types.KeyNextGlobalPoolNumber, bz)
@@ -222,7 +222,7 @@ func (k Keeper) GetNextPoolNumberAndIncrement(ctx sdk.Context) uint64 {
 		poolNumber = val.GetValue()
 	}
 
-	k.SetNextPoolNumber(ctx, poolNumber+1)
+	k.setNextPoolNumber(ctx, poolNumber+1)
 	return poolNumber
 }
 
diff --git a/x/gamm/keeper/total_liquidity.go b/x/gamm/keeper/total_liquidity.go
index 851b62c18ca..c82b0e9126b 100644
--- a/x/gamm/keeper/total_liquidity.go
+++ b/x/gamm/keeper/total_liquidity.go
@@ -16,13 +16,13 @@ func (k Keeper) GetTotalLiquidity(ctx sdk.Context) sdk.Coins {
 	return coins
 }
 
-func (k Keeper) SetTotalLiquidity(ctx sdk.Context, coins sdk.Coins) {
+func (k Keeper) setTotalLiquidity(ctx sdk.Context, coins sdk.Coins) {
 	for _, coin := range coins {
-		k.SetDenomLiquidity(ctx, coin.Denom, coin.Amount)
+		k.setDenomLiquidity(ctx, coin.Denom, coin.Amount)
 	}
 }
 
-func (k Keeper) SetDenomLiquidity(ctx sdk.Context, denom string, amount sdk.Int) {
+func (k Keeper) setDenomLiquidity(ctx sdk.Context, denom string, amount sdk.Int) {
 	store := ctx.KVStore(k.storeKey)
 	bz, err := amount.Marshal()
 	if err != nil {
@@ -68,7 +68,7 @@ func (k Keeper) RecordTotalLiquidityIncrease(ctx sdk.Context, coins sdk.Coins) {
 	for _, coin := range coins {
 		amount := k.GetDenomLiquidity(ctx, coin.Denom)
 		amount = amount.Add(coin.Amount)
-		k.SetDenomLiquidity(ctx, coin.Denom, amount)
+		k.setDenomLiquidity(ctx, coin.Denom, amount)
 	}
 }
 
@@ -76,6 +76,6 @@ func (k Keeper) RecordTotalLiquidityDecrease(ctx sdk.Context, coins sdk.Coins) {
 	for _, coin := range coins {
 		amount := k.GetDenomLiquidity(ctx, coin.Denom)
 		amount = amount.Sub(coin.Amount)
-		k.SetDenomLiquidity(ctx, coin.Denom, amount)
+		k.setDenomLiquidity(ctx, coin.Denom, amount)
 	}
 }

From 0cd1faccc50a0a8e9cece3b336406a2fa50a0544 Mon Sep 17 00:00:00 2001
From: alpo <yukseloglua@berkeley.edu>
Date: Sat, 16 Jul 2022 18:43:07 -0700
Subject: [PATCH 3/7] comment out problematic upgrades and make SetPool private

---
 app/apptesting/test_suite.go    |  4 ----
 app/upgrades/v4/upgrades.go     |  5 ++---
 app/upgrades/v9/prop214.go      |  9 +++++----
 app/upgrades/v9/prop214_test.go | 12 ++++++------
 x/gamm/keeper/export_test.go    |  2 +-
 x/gamm/keeper/genesis.go        |  2 +-
 x/gamm/keeper/pool.go           |  4 ++--
 x/gamm/keeper/pool_service.go   |  2 +-
 x/gamm/keeper/share.go          |  4 ++--
 x/gamm/keeper/swap.go           |  2 +-
 x/gamm/twap/module.go           |  2 ++
 x/gamm/twap/types/keys.go       |  4 +---
 12 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
index a73be4ece5e..0564ab31396 100644
--- a/app/apptesting/test_suite.go
+++ b/app/apptesting/test_suite.go
@@ -174,10 +174,6 @@ func (s *KeeperTestHelper) AllocateRewardsToValidator(valAddr sdk.ValAddress, re
 
 // SetupGammPoolsWithBondDenomMultiplier uses given multipliers to set initial pool supply of bond denom.
 func (s *KeeperTestHelper) SetupGammPoolsWithBondDenomMultiplier(multipliers []sdk.Dec) []gammtypes.PoolI {
-	s.App.GAMMKeeper.SetParams(s.Ctx, gammtypes.Params{
-		PoolCreationFee: sdk.Coins{},
-	})
-
 	bondDenom := s.App.StakingKeeper.BondDenom(s.Ctx)
 	// TODO: use sdk crypto instead of tendermint to generate address
 	acc1 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address().Bytes())
diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
index e5b60ae3615..ab524e32cf5 100644
--- a/app/upgrades/v4/upgrades.go
+++ b/app/upgrades/v4/upgrades.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/osmosis-labs/osmosis/v7/app/keepers"
 	"github.com/osmosis-labs/osmosis/v7/app/upgrades"
-	gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
 )
 
 // CreateUpgradeHandler returns an x/upgrade handler for the Osmosis v4 on-chain
@@ -22,8 +21,8 @@ func CreateUpgradeHandler(
 	keepers *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		// configure upgrade for x/gamm module pool creation fee param
-		keepers.GAMMKeeper.SetParams(ctx, gammtypes.NewParams(sdk.Coins{sdk.NewInt64Coin("uosmo", 1)})) // 1 uOSMO
+		// Commented for recordkeeping. SetParams is now private:
+		// 		keepers.GAMMKeeper.SetParams(ctx, gammtypes.NewParams(sdk.Coins{sdk.NewInt64Coin("uosmo", 1)})) // 1 uOSMO
 
 		Prop12(ctx, keepers.BankKeeper, keepers.DistrKeeper)
 
diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go
index 769b2cc7710..9e9f0db9d87 100644
--- a/app/upgrades/v9/prop214.go
+++ b/app/upgrades/v9/prop214.go
@@ -25,8 +25,9 @@ func ExecuteProp214(ctx sdk.Context, gamm *gammkeeper.Keeper) {
 
 	balancerPool.PoolParams.SwapFee = sdk.MustNewDecFromStr("0.002")
 
-	err = gamm.SetPool(ctx, balancerPool)
-	if err != nil {
-		panic(err)
-	}
+	// Commented for recordkeeping. SetPool is now private:
+	// 		err = gamm.SetPool(ctx, balancerPool)
+	// 		if err != nil {
+	//	 		panic(err)
+	//  	}
 }
diff --git a/app/upgrades/v9/prop214_test.go b/app/upgrades/v9/prop214_test.go
index 4445d2791bd..d93ba40a5e1 100644
--- a/app/upgrades/v9/prop214_test.go
+++ b/app/upgrades/v9/prop214_test.go
@@ -3,7 +3,6 @@ package v9_test
 import (
 	"testing"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/v7/app/apptesting"
@@ -26,11 +25,12 @@ func (suite *UpgradeTestSuite) TestProp214() {
 	poolId := suite.PrepareBalancerPool()
 	v9.ExecuteProp214(suite.Ctx, suite.App.GAMMKeeper)
 
-	pool, err := suite.App.GAMMKeeper.GetPoolAndPoke(suite.Ctx, poolId)
+	_, err := suite.App.GAMMKeeper.GetPoolAndPoke(suite.Ctx, poolId)
 	suite.Require().NoError(err)
 
-	swapFee := pool.GetSwapFee(suite.Ctx)
-	expectedSwapFee := sdk.MustNewDecFromStr("0.002")
-
-	suite.Require().Equal(expectedSwapFee, swapFee)
+	// Commented for recordkeeping. Since SetPool is now private, the changes being tested for can no longer be made:
+	// 		swapFee := pool.GetSwapFee(suite.Ctx)
+	//  	expectedSwapFee := sdk.MustNewDecFromStr("0.002")
+	//
+	//  	suite.Require().Equal(expectedSwapFee, swapFee)
 }
diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go
index d4ea2fff460..005c6960e91 100644
--- a/x/gamm/keeper/export_test.go
+++ b/x/gamm/keeper/export_test.go
@@ -9,4 +9,4 @@ import (
 // SetParams sets the total set of params.
 func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 	k.setParams(ctx, params)
-}
\ No newline at end of file
+}
diff --git a/x/gamm/keeper/genesis.go b/x/gamm/keeper/genesis.go
index 2720c8643e5..76c9d522743 100644
--- a/x/gamm/keeper/genesis.go
+++ b/x/gamm/keeper/genesis.go
@@ -22,7 +22,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState, unpack
 		if err != nil {
 			panic(err)
 		}
-		err = k.SetPool(ctx, pool)
+		err = k.setPool(ctx, pool)
 		if err != nil {
 			panic(err)
 		}
diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go
index 89e3e36da8b..d1bfd8c6210 100644
--- a/x/gamm/keeper/pool.go
+++ b/x/gamm/keeper/pool.go
@@ -80,7 +80,7 @@ func (k Keeper) GetPoolsAndPoke(ctx sdk.Context) (res []types.PoolI, err error)
 	return res, nil
 }
 
-func (k Keeper) SetPool(ctx sdk.Context, pool types.PoolI) error {
+func (k Keeper) setPool(ctx sdk.Context, pool types.PoolI) error {
 	bz, err := k.MarshalPool(pool)
 	if err != nil {
 		return err
@@ -248,7 +248,7 @@ func (k *Keeper) SetStableSwapScalingFactors(ctx sdk.Context, scalingFactors []u
 
 	stableswapPool.ScalingFactor = scalingFactors
 
-	if err = k.SetPool(ctx, stableswapPool); err != nil {
+	if err = k.setPool(ctx, stableswapPool); err != nil {
 		return err
 	}
 	return nil
diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go
index 094eea0f4a5..485b428e06f 100644
--- a/x/gamm/keeper/pool_service.go
+++ b/x/gamm/keeper/pool_service.go
@@ -160,7 +160,7 @@ func (k Keeper) CreatePool(ctx sdk.Context, msg types.CreatePoolMsg) (uint64, er
 		Display: poolShareDisplayDenom,
 	})
 
-	if err := k.SetPool(ctx, pool); err != nil {
+	if err := k.setPool(ctx, pool); err != nil {
 		return 0, err
 	}
 
diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go
index ae76041b03c..6f29c547210 100644
--- a/x/gamm/keeper/share.go
+++ b/x/gamm/keeper/share.go
@@ -17,7 +17,7 @@ func (k Keeper) applyJoinPoolStateChange(ctx sdk.Context, pool types.PoolI, join
 		return err
 	}
 
-	err = k.SetPool(ctx, pool)
+	err = k.setPool(ctx, pool)
 	if err != nil {
 		return err
 	}
@@ -39,7 +39,7 @@ func (k Keeper) applyExitPoolStateChange(ctx sdk.Context, pool types.PoolI, exit
 		return err
 	}
 
-	err = k.SetPool(ctx, pool)
+	err = k.setPool(ctx, pool)
 	if err != nil {
 		return err
 	}
diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go
index ec3f6f71acb..edb968e2bec 100644
--- a/x/gamm/keeper/swap.go
+++ b/x/gamm/keeper/swap.go
@@ -147,7 +147,7 @@ func (k Keeper) updatePoolForSwap(
 	tokensIn := sdk.Coins{tokenIn}
 	tokensOut := sdk.Coins{tokenOut}
 
-	err := k.SetPool(ctx, pool)
+	err := k.setPool(ctx, pool)
 	if err != nil {
 		return err
 	}
diff --git a/x/gamm/twap/module.go b/x/gamm/twap/module.go
index 1601969b775..9dae3925b85 100644
--- a/x/gamm/twap/module.go
+++ b/x/gamm/twap/module.go
@@ -54,6 +54,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod
 // Interfaces.
 func (b AppModuleBasic) RegisterRESTRoutes(ctx client.Context, r *mux.Router) {
 }
+
 func (b AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
 	types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) //nolint:errcheck
 }
@@ -62,6 +63,7 @@ func (b AppModuleBasic) GetTxCmd() *cobra.Command {
 	return nil
 	// return cli.NewTxCmd()
 }
+
 func (b AppModuleBasic) GetQueryCmd() *cobra.Command {
 	return nil
 	// return cli.GetQueryCmd()
diff --git a/x/gamm/twap/types/keys.go b/x/gamm/twap/types/keys.go
index c20ffdd8abf..5020db04d7c 100644
--- a/x/gamm/twap/types/keys.go
+++ b/x/gamm/twap/types/keys.go
@@ -10,6 +10,4 @@ const (
 	QuerierRoute = ModuleName
 )
 
-var (
-	AlteredPoolIdsPrefix = []byte{0}
-)
+var AlteredPoolIdsPrefix = []byte{0}

From f9422fd024a43836ea28010993123f8a00167bb5 Mon Sep 17 00:00:00 2001
From: alpo <yukseloglua@berkeley.edu>
Date: Sat, 16 Jul 2022 22:59:56 -0700
Subject: [PATCH 4/7] fix broken test

---
 app/apptesting/test_suite.go    |  5 ++---
 app/upgrades/v4/upgrade_test.go | 13 ++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
index 0564ab31396..0e892295587 100644
--- a/app/apptesting/test_suite.go
+++ b/app/apptesting/test_suite.go
@@ -178,8 +178,7 @@ func (s *KeeperTestHelper) SetupGammPoolsWithBondDenomMultiplier(multipliers []s
 	// TODO: use sdk crypto instead of tendermint to generate address
 	acc1 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address().Bytes())
 
-	poolCreationFee := s.App.GAMMKeeper.GetParams(s.Ctx)
-	s.FundAcc(acc1, poolCreationFee.PoolCreationFee)
+	params := s.App.GAMMKeeper.GetParams(s.Ctx)
 
 	pools := []gammtypes.PoolI{}
 	for index, multiplier := range multipliers {
@@ -189,7 +188,7 @@ func (s *KeeperTestHelper) SetupGammPoolsWithBondDenomMultiplier(multipliers []s
 		s.FundAcc(acc1, sdk.NewCoins(
 			sdk.NewCoin(bondDenom, uosmoAmount.Mul(sdk.NewInt(10))),
 			sdk.NewInt64Coin(token, 100000),
-		))
+		).Add(params.PoolCreationFee...))
 
 		var (
 			defaultFutureGovernor = ""
diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go
index 0a402b6f768..fec4ee2e6ce 100644
--- a/app/upgrades/v4/upgrade_test.go
+++ b/app/upgrades/v4/upgrade_test.go
@@ -7,12 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v7/app"
-	v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
+	"github.com/osmosis-labs/osmosis/v7/app"
+	v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
@@ -107,9 +108,11 @@ func (suite *UpgradeTestSuite) TestUpgradePayments() {
 				suite.Require().Equal(feePool.GetCommunityPool(), sdk.NewDecCoins(sdk.NewInt64DecCoin("uosmo", expectedBal)))
 
 				// Check that gamm Minimum Fee has been set correctly
-				gammParams := suite.app.GAMMKeeper.GetParams(suite.ctx)
-				expectedCreationFee := sdk.NewCoins(sdk.NewCoin("uosmo", sdk.OneInt()))
-				suite.Require().Equal(gammParams.PoolCreationFee, expectedCreationFee)
+
+				// Commented for recordkeeping. Since SetParams is now private, the changes being tested for can no longer be made:
+				//  	gammParams := suite.app.GAMMKeeper.GetParams(suite.ctx)
+				//  	expectedCreationFee := sdk.NewCoins(sdk.NewCoin("uosmo", sdk.OneInt()))
+				//  	suite.Require().Equal(gammParams.PoolCreationFee, expectedCreationFee)
 			},
 			true,
 		},

From 4e4f1efbe24f3551e7fa2c4c1a2a427c3e9e8e5a Mon Sep 17 00:00:00 2001
From: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>
Date: Sat, 16 Jul 2022 23:12:44 -0700
Subject: [PATCH 5/7] update comments for clarity

---
 app/upgrades/v4/upgrade_test.go | 2 +-
 app/upgrades/v4/upgrades.go     | 2 +-
 app/upgrades/v9/prop214.go      | 2 +-
 app/upgrades/v9/prop214_test.go | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go
index fec4ee2e6ce..0f66dd3dfea 100644
--- a/app/upgrades/v4/upgrade_test.go
+++ b/app/upgrades/v4/upgrade_test.go
@@ -109,7 +109,7 @@ func (suite *UpgradeTestSuite) TestUpgradePayments() {
 
 				// Check that gamm Minimum Fee has been set correctly
 
-				// Commented for recordkeeping. Since SetParams is now private, the changes being tested for can no longer be made:
+				// Kept as comments for recordkeeping. Since SetParams is now private, the changes being tested for can no longer be made:
 				//  	gammParams := suite.app.GAMMKeeper.GetParams(suite.ctx)
 				//  	expectedCreationFee := sdk.NewCoins(sdk.NewCoin("uosmo", sdk.OneInt()))
 				//  	suite.Require().Equal(gammParams.PoolCreationFee, expectedCreationFee)
diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
index ab524e32cf5..eac31d0abf5 100644
--- a/app/upgrades/v4/upgrades.go
+++ b/app/upgrades/v4/upgrades.go
@@ -21,7 +21,7 @@ func CreateUpgradeHandler(
 	keepers *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		// Commented for recordkeeping. SetParams is now private:
+		// Kept as comments for recordkeeping. SetParams is now private:
 		// 		keepers.GAMMKeeper.SetParams(ctx, gammtypes.NewParams(sdk.Coins{sdk.NewInt64Coin("uosmo", 1)})) // 1 uOSMO
 
 		Prop12(ctx, keepers.BankKeeper, keepers.DistrKeeper)
diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go
index 9e9f0db9d87..7458c9eded7 100644
--- a/app/upgrades/v9/prop214.go
+++ b/app/upgrades/v9/prop214.go
@@ -25,7 +25,7 @@ func ExecuteProp214(ctx sdk.Context, gamm *gammkeeper.Keeper) {
 
 	balancerPool.PoolParams.SwapFee = sdk.MustNewDecFromStr("0.002")
 
-	// Commented for recordkeeping. SetPool is now private:
+	// Kept as comments for recordkeeping. SetPool is now private:
 	// 		err = gamm.SetPool(ctx, balancerPool)
 	// 		if err != nil {
 	//	 		panic(err)
diff --git a/app/upgrades/v9/prop214_test.go b/app/upgrades/v9/prop214_test.go
index d93ba40a5e1..0fc62d6cb71 100644
--- a/app/upgrades/v9/prop214_test.go
+++ b/app/upgrades/v9/prop214_test.go
@@ -28,7 +28,7 @@ func (suite *UpgradeTestSuite) TestProp214() {
 	_, err := suite.App.GAMMKeeper.GetPoolAndPoke(suite.Ctx, poolId)
 	suite.Require().NoError(err)
 
-	// Commented for recordkeeping. Since SetPool is now private, the changes being tested for can no longer be made:
+	// Kept as comments for recordkeeping. Since SetPool is now private, the changes being tested for can no longer be made:
 	// 		swapFee := pool.GetSwapFee(suite.Ctx)
 	//  	expectedSwapFee := sdk.MustNewDecFromStr("0.002")
 	//

From fcb13ac884215692d03ff8eeb1f6a714f600151b Mon Sep 17 00:00:00 2001
From: alpo <62043214+AlpinYukseloglu@users.noreply.github.com>
Date: Sun, 17 Jul 2022 18:56:35 -0700
Subject: [PATCH 6/7] add changelog entry

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7e31401dab..3b1a2de297b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1630](https://github.com/osmosis-labs/osmosis/pull/1630) Delete the v043_temp module, now that we're on an updated SDK version.
 * [#1667](https://github.com/osmosis-labs/osmosis/pull/1673) Move wasm-bindings code out of app package into its own root level package.
 
+#### GAMM API changes
+* [#2013](https://github.com/osmosis-labs/osmosis/pull/2013) Make `SetParams`, `SetPool`, `SetTotalLiquidity`, and `SetDenomLiquidity` GAMM APIs private
+
 ### Features
 
 * [#1312] Stableswap: Createpool logic 

From a3a8fe910ffb08635b52a70814e1486a1cea31e2 Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Sun, 17 Jul 2022 21:21:37 -0500
Subject: [PATCH 7/7] Update CHANGELOG.md

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b1a2de297b..81c210c67ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,8 +62,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1665](https://github.com/osmosis-labs/osmosis/pull/1665) Delete app/App interface, instead use simapp.App
 * [#1630](https://github.com/osmosis-labs/osmosis/pull/1630) Delete the v043_temp module, now that we're on an updated SDK version.
 * [#1667](https://github.com/osmosis-labs/osmosis/pull/1673) Move wasm-bindings code out of app package into its own root level package.
-
-#### GAMM API changes
 * [#2013](https://github.com/osmosis-labs/osmosis/pull/2013) Make `SetParams`, `SetPool`, `SetTotalLiquidity`, and `SetDenomLiquidity` GAMM APIs private
 
 ### Features