support passing multiple payload queries to indexing diviner

XYOracleNetwork · Jan 3, 2024 · e66aba6 · e66aba6
1 parent b099de0
commit e66aba6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/packages/sdk/packages/indexed-results/src/hooks/support/usePollDiviners.tsx b/packages/sdk/packages/indexed-results/src/hooks/support/usePollDiviners.tsx
@@ -18,7 +18,7 @@ export const usePollingFunction = <T extends Payload = Payload>(
   functionToPoll?: FunctionToPoll,
   onResult?: (result: T[] | null) => void,
 ) => {
-  const { indexedQuery, processIndexedResults } = config ?? {}
+  const { indexedQueries, processIndexedResults } = config ?? {}
   const { isFresh } = processIndexedResults ?? {}
   const { maxDelay = 10_000, maxRetries, initialDelay = 100 } = pollDivinerConfig
 
@@ -64,7 +64,7 @@ export const usePollingFunction = <T extends Payload = Payload>(
               }
               onResult?.(result as T[] | null)
             } else {
-              console.warn('Exceeded maximum retries.', JSON.stringify(indexedQuery))
+              console.warn('Exceeded maximum retries.', JSON.stringify(indexedQueries))
               onResult?.(result as T[] | null)
             }
           } catch (e) {
@@ -76,7 +76,7 @@ export const usePollingFunction = <T extends Payload = Payload>(
         return await pollDivinersWithDelayInner(newDelay, functionToPoll)
       }
     },
-    [activePolling, maxRetries, maxDelay, freshTest, indexedQuery, onResult],
+    [activePolling, maxRetries, maxDelay, freshTest, indexedQueries, onResult],
   )
 
   /** A polling function that runs indefinitely on a set interval */

diff --git a/packages/sdk/packages/indexed-results/src/hooks/support/useTryDiviners.tsx b/packages/sdk/packages/indexed-results/src/hooks/support/useTryDiviners.tsx
@@ -7,12 +7,12 @@ import { useFetchDivinersFromNode } from './useFetchDivinersFromNode'
 
 export const useTryDiviners = <T extends Payload = Payload>(config?: IndexedResultsConfig): (() => Promise<Payload[] | undefined | null>) => {
   const { diviners } = useFetchDivinersFromNode(config)
-  const { indexedQuery, processIndexedResults } = config ?? {}
+  const { indexedQueries, processIndexedResults } = config ?? {}
   const parseIndexedResults = processIndexedResults?.parseIndexedResults
 
   const tryDiviner = useCallback(
-    async (diviner: DivinerInstance, indexedQuery: Payload, parseIndexedResults?: ProcessIndexedResults['parseIndexedResults']) => {
-      const divinedResult = await diviner.divine([indexedQuery])
+    async (diviner: DivinerInstance, indexedQueries: Payload[], parseIndexedResults?: ProcessIndexedResults['parseIndexedResults']) => {
+      const divinedResult = await diviner.divine(indexedQueries)
       let results: Payload[] | undefined
       if (divinedResult) {
         results = parseIndexedResults ? await parseIndexedResults(divinedResult) : divinedResult
@@ -26,8 +26,8 @@ export const useTryDiviners = <T extends Payload = Payload>(config?: IndexedResu
     let result: T[] | undefined | null
     let divinerCount = 0
     if (diviners && diviners?.length > 0) {
-      while (divinerCount < diviners?.length && indexedQuery) {
-        const divinerResult = await tryDiviner(diviners[divinerCount], indexedQuery, parseIndexedResults)
+      while (divinerCount < diviners?.length && indexedQueries) {
+        const divinerResult = await tryDiviner(diviners[divinerCount], indexedQueries, parseIndexedResults)
         if (divinerResult && divinerResult?.length) {
           result = divinerResult as T[]
           break
@@ -36,7 +36,7 @@ export const useTryDiviners = <T extends Payload = Payload>(config?: IndexedResu
       }
       return result ?? null
     }
-  }, [diviners, indexedQuery, parseIndexedResults, tryDiviner])
+  }, [diviners, indexedQueries, parseIndexedResults, tryDiviner])
 
   return tryDiviners
 }
diff --git a/packages/sdk/packages/indexed-results/src/interfaces/IndexedResultsConfig.ts b/packages/sdk/packages/indexed-results/src/interfaces/IndexedResultsConfig.ts
@@ -11,7 +11,7 @@ export interface IndexedResultsConfig<TPayload extends Payload = Payload> {
   /** diviner that can check the the archivist for the latest results */
   diviners: string[]
   /** query to search for indexed results */
-  indexedQuery: Payload
+  indexedQueries: Payload[]
   /** Functions to process indexedResults */
   processIndexedResults: ProcessIndexedResults
   /** Budget */

diff --git a/packages/sdk/packages/indexed-results/src/story/manifest/components/TestSentinel.tsx b/packages/sdk/packages/indexed-results/src/story/manifest/components/TestSentinel.tsx
@@ -17,7 +17,7 @@ const address = '0xBC4CA0EdA7647A8aB7C2061c2E118A18a936f13D'
 
 const supportedTokenInterfaces = [
   'ERC721',
-  'ERC1155',
+  // 'ERC1155',
   // Waiting on a Sentinel for these types
   // 'ERC721TokenReceiver',
   // 'ERC721Metadata',

diff --git a/...ages/sdk/packages/indexed-results/src/story/manifest/components/UseFreshIndexedResult.tsx b/...ages/sdk/packages/indexed-results/src/story/manifest/components/UseFreshIndexedResult.tsx
@@ -22,11 +22,11 @@ export const UseFreshIndexedResult: React.FC<UseIndexedResultsProps> = ({ addres
   const [node] = useNode()
 
   const config: UseIndexedResultsConfig = useMemo(() => {
-    const indexedQuery = { address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }
+    const indexedQueries = [{ address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }]
     const config: UseIndexedResultsConfig = {
       indexedResultsConfig: {
         diviners,
-        indexedQuery,
+        indexedQueries,
         processIndexedResults: {
           parseIndexedResults: async (payloads: Payload[]) => {
             return (

diff --git a/packages/sdk/packages/indexed-results/src/story/manifest/components/UseIndexedResults.tsx b/packages/sdk/packages/indexed-results/src/story/manifest/components/UseIndexedResults.tsx
@@ -11,11 +11,11 @@ export const UseIndexedResults: React.FC<UseIndexedResultsProps> = ({ address, c
   const [archivist] = useArchivistFromNode('Archivist')
 
   const config = useMemo(() => {
-    const indexedQuery = { address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }
+    const indexedQueries = [{ address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }]
     const config: UseIndexedResultsConfig = {
       indexedResultsConfig: {
         diviners,
-        indexedQuery,
+        indexedQueries,
         processIndexedResults: {
           parseIndexedResults: async (payloads: Payload[]) => {
             return await Promise.all(

diff --git a/...es/sdk/packages/indexed-results/src/story/manifest/components/UseIndexedResultsNoPoll.tsx b/...es/sdk/packages/indexed-results/src/story/manifest/components/UseIndexedResultsNoPoll.tsx
@@ -11,11 +11,11 @@ export const UseIndexedResultsNoPoll: React.FC<UseIndexedResultsProps> = ({ addr
   const [archivist] = useArchivistFromNode('Archivist')
 
   const config = useMemo(() => {
-    const indexedQuery = { address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }
+    const indexedQueries = [{ address, chainId, implemented: true, schema: PayloadDivinerQuerySchema, tokenInterface }]
     const config: UseIndexedResultsConfig = {
       indexedResultsConfig: {
         diviners,
-        indexedQuery,
+        indexedQueries,
         processIndexedResults: {
           parseIndexedResults: async (payloads: Payload[]) => {
             return await Promise.all(