implement shared proto file

proto/osmosis/gamm/v1beta1/genesis.proto

@@ -5,6 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "osmosis/gamm/v1beta1/shared.proto";
 
 // Params holds parameters for the incentives module
 message Params {
@@ -26,22 +27,3 @@ message GenesisState {
   Params params = 3 [ (gogoproto.nullable) = false ];
   MigrationRecords migration_records = 4;
 }
-
-// MigrationRecords contains all the links between balancer and concentrated
-// pools
-message MigrationRecords {
-  repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links =
-      1 [ (gogoproto.nullable) = false ];
-}
-
-// BalancerToConcentratedPoolLink defines a single link between a single
-// balancer pool and a single concentrated liquidity pool. This link is used to
-// allow a balancer pool to migrate to a single canonical full range
-// concentrated liquidity pool position
-// A balancer pool can be linked to a maximum of one cl pool, and a cl pool can
-// be linked to a maximum of one balancer pool.
-message BalancerToConcentratedPoolLink {
-  option (gogoproto.equal) = true;
-  uint64 balancer_pool_id = 1;
-  uint64 cl_pool_id = 2;
-}

proto/osmosis/gamm/v1beta1/gov.proto

@@ -3,6 +3,7 @@ package osmosis.gamm.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "osmosis/gamm/v1beta1/genesis.proto";
+import "osmosis/gamm/v1beta1/shared.proto";
 import "cosmos_proto/cosmos.proto";
 import "amino/amino.proto";
 

proto/osmosis/gamm/v1beta1/shared.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+package osmosis.gamm.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+import "cosmos_proto/cosmos.proto";
+import "cosmos/base/v1beta1/coin.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types";
+
+// MigrationRecords contains all the links between balancer and concentrated
+// pools
+message MigrationRecords {
+  repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links =
+      1 [ (gogoproto.nullable) = false ];
+}
+
+// BalancerToConcentratedPoolLink defines a single link between a single
+// balancer pool and a single concentrated liquidity pool. This link is used to
+// allow a balancer pool to migrate to a single canonical full range
+// concentrated liquidity pool position
+// A balancer pool can be linked to a maximum of one cl pool, and a cl pool can
+// be linked to a maximum of one balancer pool.
+message BalancerToConcentratedPoolLink {
+  option (gogoproto.equal) = true;
+  uint64 balancer_pool_id = 1;
+  uint64 cl_pool_id = 2;
+}

proto/osmosis/pool-incentives/v1beta1/genesis.proto

@@ -25,28 +25,3 @@ message GenesisState {
     (gogoproto.moretags) = "yaml:\"pool_to_gauges\""
   ];
 }
-
-// MigrationRecords contains all the links between balancer and concentrated
-// pools.
-//
-// This is copied over from the gamm proto file in order to circumnavigate
-// the circular dependency between the two modules.
-message MigrationRecords {
-  repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links =
-      1 [ (gogoproto.nullable) = false ];
-}
-
-// BalancerToConcentratedPoolLink defines a single link between a single
-// balancer pool and a single concentrated liquidity pool. This link is used to
-// allow a balancer pool to migrate to a single canonical full range
-// concentrated liquidity pool position
-// A balancer pool can be linked to a maximum of one cl pool, and a cl pool can
-// be linked to a maximum of one balancer pool.
-//
-// This is copied over from the gamm proto file in order to circumnavigate
-// the circular dependency between the two modules.
-message BalancerToConcentratedPoolLink {
-  option (gogoproto.equal) = true;
-  uint64 balancer_pool_id = 1;
-  uint64 cl_pool_id = 2;
-}

proto/osmosis/pool-incentives/v1beta1/shared.proto

@@ -0,0 +1,33 @@
+syntax = "proto3";
+package osmosis.poolincentives.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/duration.proto";
+import "osmosis/pool-incentives/v1beta1/incentives.proto";
+
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types";
+
+// MigrationRecords contains all the links between balancer and concentrated
+// pools.
+//
+// This is copied over from the gamm proto file in order to circumnavigate
+// the circular dependency between the two modules.
+message MigrationRecords {
+  repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links =
+      1 [ (gogoproto.nullable) = false ];
+}
+
+// BalancerToConcentratedPoolLink defines a single link between a single
+// balancer pool and a single concentrated liquidity pool. This link is used to
+// allow a balancer pool to migrate to a single canonical full range
+// concentrated liquidity pool position
+// A balancer pool can be linked to a maximum of one cl pool, and a cl pool can
+// be linked to a maximum of one balancer pool.
+//
+// This is copied over from the gamm proto file in order to circumnavigate
+// the circular dependency between the two modules.
+message BalancerToConcentratedPoolLink {
+  option (gogoproto.equal) = true;
+  uint64 balancer_pool_id = 1;
+  uint64 cl_pool_id = 2;
+}