Merge branch 'restake-init' into master-feed

Author: RogerKSI

proto/restake/v1beta1/query.proto

@@ -22,22 +22,22 @@ service Query {
 
   // Rewards returns rewards for a specific address.
   rpc Rewards(QueryRewardsRequest) returns (QueryRewardsResponse) {
-    option (google.api.http).get = "/restake/v1beta1/lockers/{locker_address}/rewards";
+    option (google.api.http).get = "/restake/v1beta1/stakers/{staker_address}/rewards";
   }
 
   // Reward returns a reward for a specific address and a key.
   rpc Reward(QueryRewardRequest) returns (QueryRewardResponse) {
-    option (google.api.http).get = "/restake/v1beta1/lockers/{locker_address}/rewards/{key}";
+    option (google.api.http).get = "/restake/v1beta1/stakers/{staker_address}/rewards/{key}";
   }
 
   // Locks returns all lock information for a specific address.
   rpc Locks(QueryLocksRequest) returns (QueryLocksResponse) {
-    option (google.api.http).get = "/restake/v1beta1/lockers/{locker_address}/locks";
+    option (google.api.http).get = "/restake/v1beta1/stakers/{staker_address}/locks";
   }
 
   // Lock returns a lock information for a specific address and a key.
   rpc Lock(QueryLockRequest) returns (QueryLockResponse) {
-    option (google.api.http).get = "/restake/v1beta1/lockers/{locker_address}/locks/{key}";
+    option (google.api.http).get = "/restake/v1beta1/stakers/{staker_address}/locks/{key}";
   }
 }
 
@@ -70,16 +70,16 @@ message QueryKeyResponse {
 
 // QueryRewardsRequest represents the request type for the Query/Rewards RPC method.
 message QueryRewardsRequest {
-  // locker_address is the target address to query rewards.
-  string locker_address = 1;
+  // staker_address is the target address to query rewards.
+  string staker_address = 1;
 
   // pagination defines optional pagination parameters.
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 // QueryRewardsResponse represents the response type for the Query/Rewards RPC method.
 message QueryRewardsResponse {
-  // rewards is a list of rewards for the locker.
+  // rewards is a list of rewards for the staker.
   repeated Reward rewards = 1;
 
   // pagination defines pagination parameters in the response.
@@ -88,31 +88,31 @@ message QueryRewardsResponse {
 
 // QueryRewardRequest represents the request type for the Query/Reward RPC method.
 message QueryRewardRequest {
-  // locker_address is the target address to query reward.
-  string locker_address = 1;
+  // staker_address is the target address to query reward.
+  string staker_address = 1;
 
   // key is the target key to query reward.
   string key = 2;
 }
 
 // QueryRewardResponse represents the response type for the Query/Reward RPC method.
 message QueryRewardResponse {
-  // reward is the reward for the locker and the key.
+  // reward is the reward for the staker and the key.
   Reward reward = 1 [(gogoproto.nullable) = false];
 }
 
 // QueryLocksRequest represents the request type for the Query/Locks RPC method.
 message QueryLocksRequest {
-  // locker_address is the target address to query locks.
-  string locker_address = 1;
+  // staker_address is the target address to query locks.
+  string staker_address = 1;
 
   // pagination defines optional pagination parameters.
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 // QueryLocksResponse represents the response type for the Query/Locks RPC method.
 message QueryLocksResponse {
-  // locks is a list of locks of the locker.
+  // locks is a list of locks of the staker.
   repeated LockResponse locks = 1;
 
   // pagination defines pagination parameters in the response.
@@ -121,15 +121,15 @@ message QueryLocksResponse {
 
 // QueryLockRequest represents the request type for the Query/Lock RPC method.
 message QueryLockRequest {
-  // locker_address is the target address to query lock.
-  string locker_address = 1;
+  // staker_address is the target address to query lock.
+  string staker_address = 1;
 
   // key is the target key to query reward.
   string key = 2;
 }
 
 // QueryLockResponse represents the response type for the Query/Lock RPC method.
 message QueryLockResponse {
-  // lock is the lock of the locker and the key.
+  // lock is the lock of the staker and the key.
   LockResponse lock = 1 [(gogoproto.nullable) = false];
 }

proto/restake/v1beta1/tx.proto

@@ -15,11 +15,11 @@ service Msg {
 
 // MsgClaimRewards is the request message type for claiming rewards.
 message MsgClaimRewards {
-  option (cosmos.msg.v1.signer) = "locker_address";
+  option (cosmos.msg.v1.signer) = "staker_address";
   option (amino.name)           = "restake/MsgClaimRewards";
 
-  // lockerAddress is the address that will claim the rewards.
-  string locker_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // staker_address is the address that will claim the rewards.
+  string staker_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // key is the key that want to claim rewards from.
   string key = 2;

proto/restake/v1beta1/types.proto

@@ -49,8 +49,8 @@ message Key {
 message Lock {
   option (gogoproto.equal) = true;
 
-  // locker_address is the owner's address of the locker.
-  string locker_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // staker_address is the owner's address of the staker.
+  string staker_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // key is the key that this lock is locked to.
   string key = 2;

x/restake/client/cli/query.go

@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"context"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
@@ -21,33 +19,37 @@ func GetQueryCmd() *cobra.Command {
 	}
 
 	queryCmd.AddCommand(
-		GetQueryCmdKey(),
 		GetQueryCmdKeys(),
+		GetQueryCmdKey(),
 		GetQueryCmdRewards(),
 		GetQueryCmdReward(),
-		GetQueryCmdLocks(),
 		GetQueryCmdLock(),
+		GetQueryCmdLocks(),
 	)
 
 	return queryCmd
 }
 
-// GetQueryCmdKey implements the key query command.
-func GetQueryCmdKey() *cobra.Command {
+// GetQueryCmdKeys implements the keys query command.
+func GetQueryCmdKeys() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "key [name]",
-		Short: "shows information of the key",
-		Args:  cobra.ExactArgs(1),
+		Use:   "keys",
+		Short: "shows all keys",
+		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Key(
-				context.Background(),
-				&types.QueryKeyRequest{
-					Key: args[0],
-				},
-			)
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			res, err := queryClient.Keys(cmd.Context(), &types.QueryKeysRequest{Pagination: pageReq})
 			if err != nil {
 				return err
 			}
@@ -56,27 +58,32 @@ func GetQueryCmdKey() *cobra.Command {
 		},
 	}
 
+	flags.AddPaginationFlagsToCmd(cmd, "keys")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
 }
 
-// GetQueryCmdKeys implements the keys query command.
-func GetQueryCmdKeys() *cobra.Command {
+// GetQueryCmdKey implements the key query command.
+func GetQueryCmdKey() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "keys",
-		Short: "shows all keys",
-		Args:  cobra.NoArgs,
+		Use:   "key [name]",
+		Short: "shows information of the key",
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
-			queryClient := types.NewQueryClient(clientCtx)
-
-			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			res, err := queryClient.Keys(context.Background(), &types.QueryKeysRequest{Pagination: pageReq})
+			queryClient := types.NewQueryClient(clientCtx)
+
+			res, err := queryClient.Key(
+				cmd.Context(),
+				&types.QueryKeyRequest{
+					Key: args[0],
+				},
+			)
 			if err != nil {
 				return err
 			}
@@ -85,7 +92,6 @@ func GetQueryCmdKeys() *cobra.Command {
 		},
 	}
 
-	flags.AddPaginationFlagsToCmd(cmd, "keys")
 	flags.AddQueryFlagsToCmd(cmd)
 
 	return cmd
@@ -94,15 +100,25 @@ func GetQueryCmdKeys() *cobra.Command {
 // GetQueryCmdRewards implements the rewards query command.
 func GetQueryCmdRewards() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "rewards [locker_address]",
+		Use:   "rewards [staker_address]",
 		Short: "shows all rewards of an address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Rewards(context.Background(), &types.QueryRewardsRequest{
-				LockerAddress: args[0],
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			res, err := queryClient.Rewards(cmd.Context(), &types.QueryRewardsRequest{
+				StakerAddress: args[0],
+				Pagination:    pageReq,
 			})
 			if err != nil {
 				return err
@@ -121,15 +137,19 @@ func GetQueryCmdRewards() *cobra.Command {
 // GetQueryCmdReward implements the reward query command.
 func GetQueryCmdReward() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "reward [locker_address] [key_name]",
-		Short: "shows the reward of an locker address for the key",
+		Use:   "reward [staker_address] [key_name]",
+		Short: "shows the reward of an staker address for the key",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Reward(context.Background(), &types.QueryRewardRequest{
-				LockerAddress: args[0],
+			res, err := queryClient.Reward(cmd.Context(), &types.QueryRewardRequest{
+				StakerAddress: args[0],
 				Key:           args[1],
 			})
 			if err != nil {
@@ -148,15 +168,25 @@ func GetQueryCmdReward() *cobra.Command {
 // GetQueryCmdLocks implements the locks query command.
 func GetQueryCmdLocks() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "locks [locker_address]",
-		Short: "shows all locks of an locker address",
+		Use:   "locks [staker_address]",
+		Short: "shows all locks of an staker address",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Locks(context.Background(), &types.QueryLocksRequest{
-				LockerAddress: args[0],
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			res, err := queryClient.Locks(cmd.Context(), &types.QueryLocksRequest{
+				StakerAddress: args[0],
+				Pagination:    pageReq,
 			})
 			if err != nil {
 				return err
@@ -175,15 +205,19 @@ func GetQueryCmdLocks() *cobra.Command {
 // GetQueryCmdLock implements the lock query command.
 func GetQueryCmdLock() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "lock [locker_address] [key_name]",
-		Short: "shows the lock of an locker address for the key",
+		Use:   "lock [staker_address] [key_name]",
+		Short: "shows the lock of an staker address for the key",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 
-			res, err := queryClient.Lock(context.Background(), &types.QueryLockRequest{
-				LockerAddress: args[0],
+			res, err := queryClient.Lock(cmd.Context(), &types.QueryLockRequest{
+				StakerAddress: args[0],
 				Key:           args[1],
 			})
 			if err != nil {

x/restake/client/cli/tx.go

@@ -53,7 +53,7 @@ func GetTxCmdClaimRewards() *cobra.Command {
 				pageSize := uint64(1000)
 				for {
 					respRewards, err := queryClient.Rewards(context.Background(), &types.QueryRewardsRequest{
-						LockerAddress: clientCtx.GetFromAddress().String(),
+						StakerAddress: clientCtx.GetFromAddress().String(),
 						Pagination: &query.PageRequest{
 							Offset: offset,
 							Limit:  pageSize,