query: scope to tenant

fixes: #304
fixes: #285
fixes: #286

_integration/cmp/deployment.go

@@ -57,12 +57,12 @@ func orderQuery(daddr vars.Ref) gestalt.Component {
 		WithMeta(g.Require(daddr.Name()))
 }
 
-func leaseQuery(daddr vars.Ref) gestalt.Component {
+func leaseQuery(key vars.Ref, daddr vars.Ref) gestalt.Component {
 	parse := js.Do(
 		js.Str(daddr.Var(), "items", "[0]", "id", "deployment"),
 	)
 
-	return akash("lease-query", "query", "lease").
+	return akash("lease-query", "query", "lease", "-k", key.Name()).
 		FN(parse).
 		WithMeta(g.Require(daddr.Name()))
 }
@@ -73,7 +73,7 @@ func groupDeploy(key vars.Ref, daddr vars.Ref) gestalt.Component {
 		Run(g.Retry(5).
 			Run(orderQuery(daddr))).
 		Run(g.Retry(15).
-			Run(leaseQuery(daddr))).
+			Run(leaseQuery(key, daddr))).
 		Run(deployClose(key, daddr)).
 		WithMeta(g.Export(daddr.Name()))
 }

app/deployment/app.go

@@ -60,7 +60,7 @@ func (a *app) Query(state appstate.State, req tmtypes.RequestQuery) tmtypes.Resp
 
 	id := strings.TrimPrefix(req.Path, appstate.DeploymentPath)
 	if len(id) == 0 {
-		return a.doRangeQuery(state)
+		return a.doRangeQuery(state, req.Data)
 	}
 
 	key, err := keys.ParseDeploymentPath(id)
@@ -142,7 +142,7 @@ func (a *app) doQuery(state appstate.State, key keys.Deployment) tmtypes.Respons
 	}
 }
 
-func (a *app) doRangeQuery(state appstate.State) tmtypes.ResponseQuery {
+func (a *app) doRangeQuery(state appstate.State, tenant []byte) tmtypes.ResponseQuery {
 	deps, err := state.Deployment().GetMaxRange()
 	if err != nil {
 		return tmtypes.ResponseQuery{
@@ -151,6 +151,14 @@ func (a *app) doRangeQuery(state appstate.State) tmtypes.ResponseQuery {
 		}
 	}
 
+	tenantDeps := []types.Deployment{}
+	for _, deployment := range deps.Items {
+		if bytes.Equal(deployment.Tenant, tenant) {
+			tenantDeps = append(tenantDeps, deployment)
+		}
+	}
+
+	deps.Items = tenantDeps
 	bytes, err := proto.Marshal(deps)
 	if err != nil {
 		return tmtypes.ResponseQuery{

app/lease/app.go

@@ -1,6 +1,7 @@
 package lease
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"strings"
@@ -83,7 +84,7 @@ func (a *app) Query(state appstate.State, req tmtypes.RequestQuery) tmtypes.Resp
 	id := strings.TrimPrefix(req.Path, appstate.LeasePath)
 
 	if len(id) == 0 {
-		return a.doRangeQuery(state)
+		return a.doRangeQuery(state, req.Data)
 	}
 
 	{
@@ -411,15 +412,26 @@ func (a *app) doQuery(state appstate.State, key keys.Lease) tmtypes.ResponseQuer
 	}
 }
 
-func (a *app) doRangeQuery(state appstate.State) tmtypes.ResponseQuery {
-	items, err := state.Lease().All()
+func (a *app) doRangeQuery(state appstate.State, tenant []byte) tmtypes.ResponseQuery {
+	leases, err := state.Lease().All()
 	if err != nil {
 		return tmtypes.ResponseQuery{
 			Code: code.ERROR,
 			Log:  err.Error(),
 		}
 	}
 
+	items := []*types.Lease{}
+	for _, lease := range leases {
+		deployment, err := state.Deployment().Get(lease.Deployment)
+		if err != nil {
+			a.Log().Error("deployment doesn't exist for lease")
+		}
+		if bytes.Equal(deployment.Tenant, tenant) {
+			items = append(items, lease)
+		}
+	}
+
 	coll := &types.Leases{Items: items}
 
 	bytes, err := proto.Marshal(coll)

cmd/akash/query/account.go

@@ -11,14 +11,23 @@ func queryAccountCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "account [account ...]",
 		Short: "query account",
-		Args:  cobra.ExactArgs(1),
 		RunE:  session.WithSession(session.RequireNode(doQueryAccountCommand)),
 	}
-
+	session.AddFlagKeyOptional(cmd, cmd.Flags())
 	return cmd
 }
 
 func doQueryAccountCommand(session session.Session, cmd *cobra.Command, args []string) error {
+	if len(args) == 0 {
+		_, info, err := session.Signer()
+		if err != nil {
+			return err
+		}
+		if err := handleMessage(session.QueryClient().Account(session.Ctx(), info.PubKey.Address().Bytes())); err != nil {
+			return err
+		}
+		return nil
+	}
 	for _, arg := range args {
 		key, err := keys.ParseAccountPath(arg)
 		if err != nil {

cmd/akash/query/deployment.go

@@ -13,13 +13,20 @@ func queryDeploymentCommand() *cobra.Command {
 		Short: "query deployment",
 		RunE:  session.WithSession(session.RequireNode(doQueryDeploymentCommand)),
 	}
-
+	session.AddFlagKeyOptional(cmd, cmd.Flags())
 	return cmd
 }
 
 func doQueryDeploymentCommand(session session.Session, cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
-		return handleMessage(session.QueryClient().Deployments(session.Ctx()))
+		_, info, err := session.Signer()
+		if err != nil {
+			return err
+		}
+		if err := handleMessage(session.QueryClient().TenantDeployments(session.Ctx(), info.PubKey.Address().Bytes())); err != nil {
+			return err
+		}
+		return nil
 	}
 	for _, arg := range args {
 		key, err := keys.ParseDeploymentPath(arg)

cmd/akash/query/lease.go

@@ -13,13 +13,20 @@ func queryLeaseCommand() *cobra.Command {
 		Short: "query lease",
 		RunE:  session.WithSession(session.RequireNode(doQueryLeaseCommand)),
 	}
-
+	session.AddFlagKeyOptional(cmd, cmd.Flags())
 	return cmd
 }
 
 func doQueryLeaseCommand(session session.Session, cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
-		return handleMessage(session.QueryClient().Leases(session.Ctx()))
+		_, info, err := session.Signer()
+		if err != nil {
+			return err
+		}
+		if err := handleMessage(session.QueryClient().TenantLeases(session.Ctx(), info.PubKey.Address().Bytes())); err != nil {
+			return err
+		}
+		return nil
 	}
 	for _, arg := range args {
 		key, err := keys.ParseLeasePath(arg)

cmd/akash/session/flags.go

@@ -19,6 +19,10 @@ func AddFlagKey(cmd *cobra.Command, flags *pflag.FlagSet) {
 	cmd.MarkFlagRequired(flagKey)
 }
 
+func AddFlagKeyOptional(cmd *cobra.Command, flags *pflag.FlagSet) {
+	flags.StringP(flagKey, "k", "", "key name")
+}
+
 func AddFlagNonce(cmd *cobra.Command, flags *pflag.FlagSet) {
 	flags.Uint64(flagNonce, 0, "nonce (optional)")
 }