Merge branch 'develop' into bb_auctions

vegaprotocol · Sep 5, 2024 · ba6b23e · ba6b23e
2 parents d4194f8 + c796944
commit ba6b23e
Show file tree

Hide file tree

Showing 6 changed files with 4,619 additions and 4,570 deletions.
diff --git a/datanode/api/trading_data_v2.go b/datanode/api/trading_data_v2.go
@@ -1579,6 +1579,22 @@ func (t *TradingDataServiceV2) ListAllPositions(ctx context.Context, req *v2.Lis
 			return nil, formatE(err, errors.New("one or more party id is invalid"))
 		}
 		req.Filter.PartyIds = partyIDs
+
+		// check for derived parties
+		if ptr.UnBox(req.Filter.IncludeDerivedParties) {
+			if len(partyIDs) == 0 {
+				return nil, formatE(newInvalidArgumentError("includeDerivedParties requires a partyId"))
+			}
+
+			derivedParties, err := t.AMMPoolService.GetSubKeysForParties(ctx, partyIDs, marketIDs)
+			if err != nil {
+				return nil, formatE(ErrPositionServiceGetByParty, err)
+			}
+			slices.Sort(derivedParties)
+			partyIDs = append(partyIDs, derivedParties...)
+		}
+
+		req.Filter.PartyIds = partyIDs
 	}
 
 	pagination, err := entities.CursorPaginationFromProto(req.Pagination)

diff --git a/datanode/gateway/graphql/generated.go b/datanode/gateway/graphql/generated.go
diff --git a/datanode/gateway/graphql/schema.graphql b/datanode/gateway/graphql/schema.graphql
@@ -6340,6 +6340,7 @@ type PositionEdge {
 input PositionsFilter {
   partyIds: [ID!]
   marketIds: [ID!]
+  includeDerivedParties: Boolean
 }
 
 "Connection type for retrieving cursor-based paginated position information"

diff --git a/datanode/sqlstore/amm_pool.go b/datanode/sqlstore/amm_pool.go
@@ -22,6 +22,7 @@ import (
 
 	"code.vegaprotocol.io/vega/datanode/entities"
 	"code.vegaprotocol.io/vega/datanode/metrics"
+	"code.vegaprotocol.io/vega/libs/ptr"
 	v2 "code.vegaprotocol.io/vega/protos/data-node/api/v2"
 
 	"github.com/georgysavva/scany/pgxscan"
@@ -165,12 +166,12 @@ func (p *AMMPools) GetSubKeysForParties(ctx context.Context, partyIDs []string,
 	}
 	parties := strings.Builder{}
 	args := make([]any, 0, len(partyIDs)+len(marketIDs))
-	query := `SELECT amm_party_id FROM amms WHERE "`
+	query := `SELECT amm_party_id FROM amms WHERE `
 	for i, party := range partyIDs {
 		if i > 0 {
 			parties.WriteString(",")
 		}
-		parties.WriteString(nextBindVar(&args, party))
+		parties.WriteString(nextBindVar(&args, ptr.From(entities.PartyID(party))))
 	}
 	query = fmt.Sprintf(`%s party_id IN (%s)`, query, parties.String())
 	if len(marketIDs) > 0 {
@@ -179,16 +180,22 @@ func (p *AMMPools) GetSubKeysForParties(ctx context.Context, partyIDs []string,
 			if i > 0 {
 				markets.WriteString(",")
 			}
-			markets.WriteString(nextBindVar(&args, mID))
+
+			markets.WriteString(nextBindVar(&args, ptr.From(entities.MarketID(mID))))
 		}
-		query = fmt.Sprintf("%s AND market_id IN(%s)", query, markets.String())
+		query = fmt.Sprintf("%s AND market_id IN (%s)", query, markets.String())
 	}
 
-	subKeys := []string{}
+	subKeys := []entities.PartyID{}
 	if err := pgxscan.Select(ctx, p.ConnectionSource, &subKeys, query, args...); err != nil {
 		return nil, err
 	}
-	return subKeys, nil
+
+	res := make([]string, 0, len(subKeys))
+	for _, k := range subKeys {
+		res = append(res, k.String())
+	}
+	return res, nil
 }
 
 func (p *AMMPools) ListByPool(ctx context.Context, poolID entities.AMMPoolID, pagination entities.CursorPagination) ([]entities.AMMPool, entities.PageInfo, error) {