Skip to content

fix(thegraph): optimize getTransactionsByTopics#1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjlevesque merged 2 commits into from
Dec 14, 2023
+16 −28
Merged

fix(thegraph): optimize getTransactionsByTopics #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dc1485
fix(thegraph): optimize getTransactionsByTopics
benjlevesque Dec 13, 2023
90ef499
order transactions
benjlevesque Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/thegraph-data-access/src/queries.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,19 +74,22 @@ export const GetTransactionsByHashQuery = gql`
}
`;

export const GetChannelsByTopicsQuery = gql`
${TransactionsBodyFragment}
query GetChannelsByTopics($topics: [String!]!) {
${metaQueryBody}
export const GetTransactionsByTopics = gql`
${TransactionsBodyFragment}

query GetTransactionsByTopics($topics: [String!]!){
${metaQueryBody}
channels(
where: { topics_contains: $topics }
){
transactions(
where: { topics_contains: $topics }
orderBy: blockTimestamp
orderBy: blockTimestamp,
orderDirection: asc
) {
channelId
...TransactionsBody
}
}
`;
}`;

export const GetBlockQuery = gql`
query GetBlock {
Expand Down
25 changes: 5 additions & 20 deletions packages/thegraph-data-access/src/subgraph-client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,10 @@ import { DataAccessTypes, StorageTypes } from '@requestnetwork/types';
import { GraphQLClient } from 'graphql-request';
import {
GetBlockQuery,
GetChannelsByTopicsQuery,
GetTransactionByDataHashQuery,
GetTransactionsByChannelIdQuery,
GetTransactionsByHashQuery,
GetTransactionsByTopics,
Meta,
Transaction,
TransactionsBody,
Expand DownExpand Up@@ -48,29 +48,14 @@ export class SubgraphClient implements StorageTypes.IIndexer {
});
}

// FIXME: this should be possible to do in a single query to the subgraph,
// but currently one transaction doesn't contain topics from previous ones on the same channel.
// This could be fixed on the Subgraph indexer code for optimization.
public async getTransactionsByTopics(
topics: string[],
): Promise<StorageTypes.IGetTransactionsResponse> {
const { _meta, transactions } = await this.graphql.request<
Meta & { transactions: { channelId: string }[] }
>(GetChannelsByTopicsQuery, { topics });
const { _meta, channels } = await this.graphql.request<
Meta & { channels: { transactions: Transaction[] }[] }
>(GetTransactionsByTopics, { topics });

const channelIds = transactions
.map((x) => x.channelId)
.filter((val, i, self) => self.indexOf(val) === i);
const transactionsByChannel = await Promise.all(
channelIds.map((channelId) =>
this.graphql
.request<TransactionsBody>(GetTransactionsByChannelIdQuery, {
channelId,
...this.getTimeVariables({}),
})
.then((x) => x.transactions),
),
).then((x) => x.flat());
const transactionsByChannel = channels.map(({ transactions }) => transactions).flat();

return {
transactions: transactionsByChannel.map(this.toIndexedTransaction),
Expand Down