Switch all proto structs to use strings for addresses

proto/osmosis/epochs/genesis.proto

@@ -8,29 +8,29 @@ import "google/protobuf/timestamp.proto";
 option go_package = "github.com/c-osmosis/osmosis/x/epochs/types";
 
 message EpochInfo {
-    string identifier = 1;
-    google.protobuf.Timestamp start_time = 2 [
-        (gogoproto.stdtime) = true,
-        (gogoproto.nullable) = false,
-        (gogoproto.moretags) = "yaml:\"start_time\""
-    ];
-    google.protobuf.Duration duration = 3 [
-        (gogoproto.nullable) = false,
-        (gogoproto.stdduration) = true,
-        (gogoproto.jsontag) = "duration,omitempty",
-        (gogoproto.moretags) = "yaml:\"duration\""
-    ];
-    int64 current_epoch = 4;
-    google.protobuf.Timestamp current_epoch_start_time = 5 [
-        (gogoproto.stdtime) = true,
-        (gogoproto.nullable) = false,
-        (gogoproto.moretags) = "yaml:\"current_epoch_start_time\""
-    ];
-    bool epoch_counting_started = 6;
-    bool current_epoch_ended = 7;
+  string identifier = 1;
+  google.protobuf.Timestamp start_time = 2 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"start_time\""
+  ];
+  google.protobuf.Duration duration = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true,
+    (gogoproto.jsontag) = "duration,omitempty",
+    (gogoproto.moretags) = "yaml:\"duration\""
+  ];
+  int64 current_epoch = 4;
+  google.protobuf.Timestamp current_epoch_start_time = 5 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"current_epoch_start_time\""
+  ];
+  bool epoch_counting_started = 6;
+  bool current_epoch_ended = 7;
 }
 
 // GenesisState defines the epochs module's genesis state.
 message GenesisState {
-    repeated EpochInfo epochs = 1 [(gogoproto.nullable) = false];
+  repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ];
 }

proto/osmosis/epochs/query.proto

@@ -10,13 +10,13 @@ option go_package = "github.com/c-osmosis/osmosis/x/epochs/types";
 
 // Query defines the gRPC querier service.
 service Query {
-    // EpochInfos provide running epochInfos
-    rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) {
-        option (google.api.http).get = "/osmosis/epochs/v1beta1/epochs";
-    }
+  // EpochInfos provide running epochInfos
+  rpc EpochInfos(QueryEpochsInfoRequest) returns (QueryEpochsInfoResponse) {
+    option (google.api.http).get = "/osmosis/epochs/v1beta1/epochs";
+  }
 }
 
 message QueryEpochsInfoRequest {}
 message QueryEpochsInfoResponse {
-    repeated EpochInfo epochs = 1 [(gogoproto.nullable) = false];
+  repeated EpochInfo epochs = 1 [ (gogoproto.nullable) = false ];
 }

proto/osmosis/gamm/v1beta1/query.proto

@@ -71,8 +71,7 @@ message QueryPoolsResponse {
 }
 
 //=============================== TotalPools
-message QueryTotalPoolsRequest {
-}
+message QueryTotalPoolsRequest {}
 message QueryTotalPoolsResponse {
   uint64 totalPools = 1 [ (gogoproto.moretags) = "yaml:\"total_pools\"" ];
 }

proto/osmosis/incentives/genesis.proto

@@ -9,7 +9,7 @@ option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
 
 // GenesisState defines the incentives module's genesis state.
 message GenesisState {
-    // params defines all the parameters of the module
-    Params params = 1 [(gogoproto.nullable) = false];
-    repeated Pot pots = 2 [(gogoproto.nullable) = false];
+  // params defines all the parameters of the module
+  Params params = 1 [ (gogoproto.nullable) = false ];
+  repeated Pot pots = 2 [ (gogoproto.nullable) = false ];
 }

proto/osmosis/incentives/params.proto

@@ -7,6 +7,7 @@ option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
 
 // Params holds parameters for the incentives module
 message Params {
-    // distribution epoch identifier
-    string distr_epoch_identifier = 1 [(gogoproto.moretags) = "yaml:\"distr_epoch_identifier\""];
+  // distribution epoch identifier
+  string distr_epoch_identifier = 1
+      [ (gogoproto.moretags) = "yaml:\"distr_epoch_identifier\"" ];
 }

proto/osmosis/incentives/query.proto

@@ -80,8 +80,7 @@ message UpcomingPotsResponse {
 }
 
 message RewardsEstRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   repeated lockup.PeriodLock locks = 2 [ (gogoproto.nullable) = false ];
   repeated Pot pots = 3 [ (gogoproto.nullable) = false ];
   int64 end_epoch = 4;

proto/osmosis/incentives/tx.proto

@@ -17,8 +17,7 @@ service Msg {
 message MsgCreatePot {
   bool is_perpetual = 1; // flag to show if it's perpetual or multi-epoch
                          // distribution incentives by third party
-  bytes owner = 2 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   osmosis.lockup.QueryCondition distribute_to = 3 [
     (gogoproto.nullable) = false
   ]; // distribute condition of a lock which meet one of these conditions
@@ -37,8 +36,7 @@ message MsgCreatePot {
 message MsgCreatePotResponse {}
 
 message MsgAddToPot {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 pot_id = 2;
   repeated cosmos.base.v1beta1.Coin rewards = 3 [
     (gogoproto.nullable) = false,

proto/osmosis/lockup/lock.proto

@@ -13,8 +13,7 @@ option go_package = "github.com/c-osmosis/osmosis/x/lockup/types";
 // coins locked.
 message PeriodLock {
   uint64 ID = 1;
-  bytes owner = 2 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 2 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 3 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true,

proto/osmosis/lockup/query.proto

@@ -75,8 +75,7 @@ message ModuleLockedAmountResponse {
 };
 
 message AccountUnlockableCoinsRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 };
 message AccountUnlockableCoinsResponse {
   repeated cosmos.base.v1beta1.Coin coins = 1 [
@@ -86,8 +85,7 @@ message AccountUnlockableCoinsResponse {
 };
 
 message AccountUnlockingCoinsRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 }
 message AccountUnlockingCoinsResponse {
   repeated cosmos.base.v1beta1.Coin coins = 1 [
@@ -97,8 +95,7 @@ message AccountUnlockingCoinsResponse {
 }
 
 message AccountLockedCoinsRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 };
 message AccountLockedCoinsResponse {
   repeated cosmos.base.v1beta1.Coin coins = 1 [
@@ -108,8 +105,7 @@ message AccountLockedCoinsResponse {
 };
 
 message AccountLockedPastTimeRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Timestamp timestamp = 2 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
@@ -121,8 +117,7 @@ message AccountLockedPastTimeResponse {
 };
 
 message AccountLockedPastTimeNotUnlockingOnlyRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Timestamp timestamp = 2 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
@@ -134,8 +129,7 @@ message AccountLockedPastTimeNotUnlockingOnlyResponse {
 };
 
 message AccountUnlockedBeforeTimeRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Timestamp timestamp = 2 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
@@ -147,8 +141,7 @@ message AccountUnlockedBeforeTimeResponse {
 }
 
 message AccountLockedPastTimeDenomRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Timestamp timestamp = 2 [
     (gogoproto.stdtime) = true,
     (gogoproto.nullable) = false,
@@ -164,8 +157,7 @@ message LockedRequest { uint64 lock_id = 1; };
 message LockedResponse { PeriodLock lock = 1; };
 
 message AccountLockedLongerDurationRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 2 [
     (gogoproto.stdduration) = true,
     (gogoproto.nullable) = false,
@@ -177,8 +169,7 @@ message AccountLockedLongerDurationResponse {
 };
 
 message AccountLockedLongerDurationNotUnlockingOnlyRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 2 [
     (gogoproto.stdduration) = true,
     (gogoproto.nullable) = false,
@@ -190,8 +181,7 @@ message AccountLockedLongerDurationNotUnlockingOnlyResponse {
 };
 
 message AccountLockedLongerDurationDenomRequest {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 2 [
     (gogoproto.stdduration) = true,
     (gogoproto.nullable) = false,

proto/osmosis/lockup/tx.proto

@@ -25,8 +25,7 @@ service Msg {
 }
 
 message MsgLockTokens {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   google.protobuf.Duration duration = 2 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true,
@@ -41,27 +40,23 @@ message MsgLockTokens {
 message MsgLockTokensResponse { uint64 ID = 1; }
 
 message MsgBeginUnlocking {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 }
 message MsgBeginUnlockingResponse { repeated PeriodLock unlocks = 1; }
 
 message MsgUnlockTokens {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 }
 message MsgUnlockTokensResponse { repeated PeriodLock unlocks = 1; }
 
 message MsgBeginUnlockPeriodLock {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
 }
 message MsgBeginUnlockPeriodLockResponse { bool success = 1; }
 
 message MsgUnlockPeriodLock {
-  bytes owner = 1 [ (gogoproto.casttype) =
-                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
   uint64 ID = 2;
 }
 message MsgUnlockPeriodLockResponse { bool success = 1; }

x/gamm/types/msgs.go

@@ -37,7 +37,6 @@ func ValidateFutureGovernor(governor string) error {
 		return nil
 	}
 
-
 	lockTimeStr := ""
 	splits := strings.Split(governor, ",")
 	if len(splits) > 2 {

x/incentives/client/cli/tx.go

@@ -87,19 +87,28 @@ func NewCreatePotCmd() *cobra.Command {
 				return err
 			}
 
-			msg := &types.MsgCreatePot{
-				Owner: clientCtx.GetFromAddress(),
-				DistributeTo: lockuptypes.QueryCondition{
-					LockQueryType: lockuptypes.LockQueryType(queryType),
-					Denom:         denom,
-					Duration:      duration,
-					Timestamp:     time.Unix(timestamp, 0),
-				},
-				Coins:             coins,
-				StartTime:         startTime,
-				NumEpochsPaidOver: numEpochsPaidOver,
+			distributeTo := lockuptypes.QueryCondition{
+				LockQueryType: lockuptypes.LockQueryType(queryType),
+				Denom:         denom,
+				Duration:      duration,
+				Timestamp:     time.Unix(timestamp, 0),
 			}
 
+			// TODO: Confirm this is correct logic
+			isPerpetual := false
+			if numEpochsPaidOver == 0 {
+				isPerpetual = true
+			}
+
+			msg := types.NewMsgCreatePot(
+				isPerpetual,
+				clientCtx.GetFromAddress(),
+				distributeTo,
+				coins,
+				startTime,
+				numEpochsPaidOver,
+			)
+
 			return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg)
 		},
 	}
@@ -133,11 +142,11 @@ func NewAddToPotCmd() *cobra.Command {
 				return err
 			}
 
-			msg := &types.MsgAddToPot{
-				Owner:   clientCtx.GetFromAddress(),
-				PotId:   potId,
-				Rewards: rewards,
-			}
+			msg := types.NewMsgAddToPot(
+				clientCtx.GetFromAddress(),
+				potId,
+				rewards,
+			)
 
 			return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg)
 		},

x/incentives/keeper/grpc_query.go

@@ -110,5 +110,9 @@ func (k Keeper) UpcomingPots(goCtx context.Context, req *types.UpcomingPotsReque
 // RewardsEst returns rewards estimation at a future specific time
 func (k Keeper) RewardsEst(goCtx context.Context, req *types.RewardsEstRequest) (*types.RewardsEstResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
-	return &types.RewardsEstResponse{Coins: k.GetRewardsEst(ctx, req.Owner, req.Locks, req.Pots, req.EndEpoch)}, nil
+	owner, err := sdk.AccAddressFromBech32(req.Owner)
+	if err != nil {
+		return nil, err
+	}
+	return &types.RewardsEstResponse{Coins: k.GetRewardsEst(ctx, owner, req.Locks, req.Pots, req.EndEpoch)}, nil
 }

x/incentives/keeper/grpc_query_test.go

@@ -145,7 +145,7 @@ func (suite *KeeperTestSuite) TestGRPCRewardsEst() {
 	// initial check
 	lockOwner := sdk.AccAddress([]byte("addr1---------------"))
 	res, err := suite.app.IncentivesKeeper.RewardsEst(sdk.WrapSDKContext(suite.ctx), &types.RewardsEstRequest{
-		Owner: lockOwner,
+		Owner: lockOwner.String(),
 	})
 	suite.Require().NoError(err)
 	suite.Require().Equal(res.Coins, sdk.Coins{})
@@ -154,7 +154,7 @@ func (suite *KeeperTestSuite) TestGRPCRewardsEst() {
 	lockOwner, _, coins, _ := suite.SetupLockAndPot(false)
 
 	res, err = suite.app.IncentivesKeeper.RewardsEst(sdk.WrapSDKContext(suite.ctx), &types.RewardsEstRequest{
-		Owner:    lockOwner,
+		Owner:    lockOwner.String(),
 		EndEpoch: 100,
 	})
 	suite.Require().NoError(err)