CL: Re-design Concentrated Liquidity Module

app/keepers/keepers.go

@@ -279,6 +279,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		appKeepers.GAMMKeeper)
 
 	appKeepers.ConcentratedLiquidityKeeper = concentratedliquidity.NewKeeper(
+		appCodec,
 		appKeepers.keys[concentratedliquiditytypes.StoreKey])
 
 	appKeepers.SwapRouterKeeper = swaprouter.NewKeeper(

app/modules.go

@@ -131,7 +131,7 @@ func appModules(
 		app.TransferModule,
 		gamm.NewAppModule(appCodec, *app.GAMMKeeper, app.AccountKeeper, app.BankKeeper),
 		twapmodule.NewAppModule(*app.TwapKeeper),
-		concentratedliquidity.NewAppModule(*app.ConcentratedLiquidityKeeper),
+		concentratedliquidity.NewAppModule(appCodec, *app.ConcentratedLiquidityKeeper),
 		txfees.NewAppModule(*app.TxFeesKeeper),
 		incentives.NewAppModule(*app.IncentivesKeeper, app.AccountKeeper, app.BankKeeper, app.EpochsKeeper),
 		lockup.NewAppModule(*app.LockupKeeper, app.AccountKeeper, app.BankKeeper),

proto/osmosis/concentrated-liquidity/concentratedPool.proto

@@ -8,7 +8,7 @@ package osmosis.concentratedliquidity.v1beta1;
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity";
+option go_package = "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity/concentrated-pool";
 
 message Pool {
   option (gogoproto.goproto_getters) = false;
@@ -39,24 +39,3 @@ message Pool {
     (gogoproto.nullable) = false
   ];
 }
-
-message TickInfo {
-  string liquidity_gross = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.moretags) = "yaml:\"liquidity_gross\"",
-    (gogoproto.nullable) = false
-  ];
-  string liquidity_net = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.moretags) = "yaml:\"liquidity_net\"",
-    (gogoproto.nullable) = false
-  ];
-}
-
-message Position {
-  string liquidity = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.moretags) = "yaml:\"liquidity\"",
-    (gogoproto.nullable) = false
-  ];
-}

proto/osmosis/concentrated-liquidity/position.proto

@@ -0,0 +1,32 @@
+syntax = "proto3";
+// this is a legacy package that requires additional migration logic
+// in order to use the correct packge. Decision made to use legacy package path
+// until clear steps for migration logic and the unknowns for state breaking are
+// investigated for changing proto package.
+package osmosis.concentratedliquidity.v1beta1;
+
+import "cosmos_proto/cosmos.proto";
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity/types";
+
+message TickInfo {
+  string liquidity_gross = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.moretags) = "yaml:\"liquidity_gross\"",
+    (gogoproto.nullable) = false
+  ];
+  string liquidity_net = 2 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.moretags) = "yaml:\"liquidity_net\"",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message Position {
+  string liquidity = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.moretags) = "yaml:\"liquidity\"",
+    (gogoproto.nullable) = false
+  ];
+}

x/concentrated-liquidity/concentrated-pool/codec.go

@@ -0,0 +1,32 @@
+package concentrated_pool
+
+import (
+	types "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity/types"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+)
+
+// RegisterLegacyAminoCodec registers the necessary x/concentrated-liquidity interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	cdc.RegisterConcrete(&Pool{}, "osmosis/concentratedliquidity/ConcentratedPool", nil)
+}
+
+func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
+	registry.RegisterInterface(
+		"osmosis.concentratedliquidity.v1beta1.PoolI",
+		(*types.PoolI)(nil),
+		&Pool{},
+	)
+}
+
+var (
+	amino     = codec.NewLegacyAmino()
+	ModuleCdc = codec.NewAminoCodec(amino)
+)
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	amino.Seal()
+}