CL: Re-design Concentrated Liquidity Module (#3296)

* Initial commit for pool

* Fix some tests

* Fix lint

* Clean up :)

* Fixing merge conflict is fun

* Adams code review

* Code review

* lint

* lint

* remove cdc from module

* shuffle tests around

Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
Co-authored-by: Roman <roman@osmosis.team>

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(

proto/osmosis/concentrated-liquidity/concentratedPool.proto → proto/osmosis/concentrated-liquidity/pool.proto

@@ -1,14 +1,14 @@
 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
+// This is a legacy package that requires additional migration logic
+// in order to use the correct package. 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/v13/x/concentrated-liquidity";
+option go_package = "github.com/osmosis-labs/osmosis/v13/x/concentrated-liquidity/internal/model";
 
 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,19 @@
+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/v13/x/concentrated-liquidity/internal/model";
+
+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/tickInfo.proto

@@ -0,0 +1,24 @@
+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/v13/x/concentrated-liquidity/internal/model";
+
+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
+  ];
+}