Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@daostack/arc.js",
"version": "2.0.0-experimental.54",
"version": "2.0.0-experimental.55",
"description": "",
"keywords": [],
"main": "dist/lib/index.js",
Expand Down
50 changes: 37 additions & 13 deletions src/arc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
} from './index'

const abis = require('./abis/abis.json')
const MAX_BATCH_QUERY = 1000

export type IArcOptions = IApolloClientOptions & {
/** Information about the contracts. Cf. [[setContractInfos]] and [[fetchContractInfos]] */
Expand Down Expand Up @@ -203,14 +204,20 @@ export class Arc extends GraphNodeObserver {

/**
* fetch contractInfos from the subgraph
* we skip the first max batch query each iteration to avoid hitting subgraph limit
* @return a list of IContractInfo instances
*/
public async fetchContractInfos(
apolloQueryOptions: IApolloQueryOptions = {}
): Promise<IContractInfo[]> {
const query = gql`
const allContractInfos = []
let contractInfos = []
let skip = 0

do {
const query = gql`
query AllContractInfos {
contractInfos(first: 1000) {
contractInfos(first: ${MAX_BATCH_QUERY} skip: ${skip * MAX_BATCH_QUERY}) {
id
name
version
Expand All @@ -219,25 +226,36 @@ export class Arc extends GraphNodeObserver {
}
}
`
// const result = await this.getObservableList(query, itemMap, apolloQueryOptions).pipe(first()).toPromise()
const response = await this.sendQuery(query, apolloQueryOptions)
const contractInfos = response.data.contractInfos as IContractInfo[]
const response = await this.sendQuery(query, apolloQueryOptions)
contractInfos = response.data.contractInfos as IContractInfo[]
if (contractInfos.length > 0) {
allContractInfos.push(...contractInfos)
}
skip++
} while (contractInfos.length === MAX_BATCH_QUERY)

const universalContractInfos = await this.fetchUniversalContractInfos()
contractInfos.push(...universalContractInfos)
this.setContractInfos(contractInfos)
return contractInfos
allContractInfos.push(...universalContractInfos)
this.setContractInfos(allContractInfos)
return allContractInfos
}

/**
* fetch universalContractInfos from the subgraph
* we skip the first max batch query each iteration to avoid hitting subgraph limit
* @return a list of IContractInfo instances
*/
public async fetchUniversalContractInfos(
apolloQueryOptions: IApolloQueryOptions = {}
): Promise<IContractInfo[]> {
const query = gql`
const allUniversalContractInfos = []
let universalContractInfos = []
let skip = 0

do {
const query = gql`
query AllUniversalContractInfos {
universalContractInfos(first: 1000) {
universalContractInfos(first: ${MAX_BATCH_QUERY} skip: ${skip * MAX_BATCH_QUERY}) {
id
name
version
Expand All @@ -246,9 +264,15 @@ export class Arc extends GraphNodeObserver {
}
}
`
const response = await this.sendQuery(query, apolloQueryOptions)
const result = response.data.universalContractInfos as IContractInfo[]
return result
const response = await this.sendQuery(query, apolloQueryOptions)
universalContractInfos = response.data.universalContractInfos as IContractInfo[]
if (universalContractInfos.length > 0) {
allUniversalContractInfos.push(...universalContractInfos)
}
skip++
} while (universalContractInfos.length === MAX_BATCH_QUERY)

return allUniversalContractInfos
}

/**
Expand Down