@xyo-network/evm-call-witness 2.85.0 → 2.85.2

package/package.json

@@ -10,34 +10,46 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.13.20",
-    "@xylabs/hex": "^2.13.20",
-    "@xylabs/promise": "^2.13.20",
-    "@xyo-network/abstract-diviner": "^2.85.0",
-    "@xyo-network/diviner-model": "^2.85.0",
-    "@xyo-network/erc1822-witness": "~2.85.0",
-    "@xyo-network/erc1967-witness": "~2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
-    "@xyo-network/witness-evm-abstract": "^2.85.0",
-    "ethers": "^6.9.1"
+    "@xylabs/assert": "^2.13.23",
+    "@xylabs/hex": "^2.13.23",
+    "@xylabs/promise": "^2.13.23",
+    "@xyo-network/diviner-abstract": "^2.85.8",
+    "@xyo-network/diviner-model": "^2.85.8",
+    "@xyo-network/erc1822-witness": "~2.85.2",
+    "@xyo-network/erc1967-witness": "~2.85.2",
+    "@xyo-network/payload-model": "^2.85.8",
+    "@xyo-network/witness-evm-abstract": "^2.85.8",
+    "ethers": "^6.9.2"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^2.13.20",
-    "@xylabs/profile": "^2.13.20",
+    "@xylabs/delay": "^2.13.23",
+    "@xylabs/jest-helpers": "^2.13.23",
+    "@xylabs/profile": "^2.13.23",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig": "^3.2.25",
-    "@xyo-network/account": "^2.85.0",
-    "@xyo-network/diviner-jsonpatch-memory": "^2.85.0",
-    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.0",
-    "@xyo-network/diviner-range": "^2.85.0",
-    "@xyo-network/evm-contract-witness": "~2.85.0",
-    "@xyo-network/evm-token-interface-diviner": "~2.85.0",
-    "@xyo-network/manifest": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
+    "@xyo-network/account": "^2.85.8",
+    "@xyo-network/archivist-memory": "^2.85.8",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.85.2",
+    "@xyo-network/diviner-boundwitness-memory": "^2.85.8",
+    "@xyo-network/diviner-jsonpatch": "^2.85.8",
+    "@xyo-network/diviner-jsonpatch-memory": "^2.85.8",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.8",
+    "@xyo-network/diviner-payload-memory": "^2.85.8",
+    "@xyo-network/diviner-payload-model": "^2.85.8",
+    "@xyo-network/diviner-range": "^2.85.8",
+    "@xyo-network/diviner-temporal-indexing": "^2.85.8",
+    "@xyo-network/evm-contract-witness": "~2.85.2",
+    "@xyo-network/evm-nft-id-payload-plugin": "~2.85.2",
+    "@xyo-network/evm-token-interface-diviner": "~2.85.2",
+    "@xyo-network/manifest": "^2.85.8",
+    "@xyo-network/module-model": "^2.85.8",
+    "@xyo-network/node-memory": "^2.85.8",
     "@xyo-network/open-zeppelin-typechain": "^3.0.5",
-    "@xyo-network/sentinel-model": "^2.85.0",
-    "@xyo-network/witness-adhoc": "^2.85.0",
-    "@xyo-network/witness-model": "^2.85.0",
+    "@xyo-network/sentinel-model": "^2.85.8",
+    "@xyo-network/witness-adhoc": "^2.85.8",
+    "@xyo-network/witness-model": "^2.85.8",
+    "@xyo-network/witness-timestamp": "^2.85.8",
+    "async-mutex": "^0.4.0",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
   },
@@ -80,6 +92,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.85.0",
+  "version": "2.85.2",
   "type": "module"
 }

package/src/Diviner.ts

@@ -1,9 +1,10 @@
 import { assertEx } from '@xylabs/assert'
 import { Promisable } from '@xylabs/promise'
-import { AbstractDiviner } from '@xyo-network/abstract-diviner'
+import { AbstractDiviner } from '@xyo-network/diviner-abstract'
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'
 import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
+import { EvmCallDivinerLabels } from './Labels'
 import { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'
 
 export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]
@@ -22,7 +23,7 @@ export type EvmCallResultsSchema = typeof EvmCallResultsSchema
 export type EvmCallResults = Payload<
   {
     address: string
-    chainId: string
+    chainId: number
     results?: Record<
       string,
       {
@@ -36,6 +37,7 @@ export type EvmCallResults = Payload<
 
 export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {
   static override configSchemas = [EvmCallDivinerConfigSchema]
+  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels
 
   protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {
     const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)
@@ -44,6 +46,7 @@ export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivine
 
   protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {
     const expectedValue = objs.at(0)?.[field] as R
+    // eslint-disable-next-line unicorn/no-array-reduce
     const didNotMatch = objs.reduce((prev, obj) => {
       return prev || obj[field] !== expectedValue
     }, false)
@@ -61,6 +64,7 @@ export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivine
   protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {
     const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))
     const addresses = Object.keys(
+      // eslint-disable-next-line unicorn/no-array-reduce
       callResults.reduce<Record<string, boolean>>((prev, result) => {
         if (result.address) {
           prev[result.address] = true
@@ -72,7 +76,7 @@ export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivine
       addresses.map(async (address) => {
         const foundCallResults = callResults.filter((callResult) => callResult.address === address)
         const results: EvmCallResults = {
-          ...{ results: await this.reduceResults(foundCallResults) },
+          results: await this.reduceResults(foundCallResults),
           ...this.contractInfoRequiredFields(foundCallResults),
         }
         return results
@@ -83,6 +87,7 @@ export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivine
   }
 
   protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {
+    // eslint-disable-next-line unicorn/no-array-reduce
     return callResults.reduce<
       Record<
         string,

package/src/Labels.ts

@@ -0,0 +1,15 @@
+import { Labels } from '@xyo-network/module-model'
+
+/**
+ * Labels for Crypto Contract Diviner components
+ */
+export interface EvmCallDivinerLabels extends Labels {
+  'network.xyo.crypto.contract.info': 'diviner'
+}
+
+/**
+ * Labels for Crypto Contract Diviner components
+ */
+export const EvmCallDivinerLabels: EvmCallDivinerLabels = {
+  'network.xyo.crypto.contract.info': 'diviner',
+}

package/src/Payload.ts

@@ -1,4 +1,4 @@
-import { Payload } from '@xyo-network/payload-model'
+import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
 export const EvmCallSchema = 'network.xyo.evm.call'
 export type EvmCallSchema = typeof EvmCallSchema
@@ -46,6 +46,8 @@ export const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFai
   return (payload as EvmCallFailure | undefined)?.error !== undefined
 }
 
+export const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)
+
 export const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)
 
 export const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)

package/src/Witness.ts

@@ -44,7 +44,7 @@ export class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnes
           try {
             const result = await contract[validatedFunctionName](...mergedArgs)
             transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result
-          } catch (ex) {
+          } catch {
             //const error = ex as Error & { code: string }
             //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)
           }

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './Diviner'
+export * from './Labels'
 export * from './model'
 export * from './Payload'
 export * from './Witness'

package/src/spec/imported/AddressToContract/AddressToContractIndex/Contract.Sentinel.Erc1155.Index.json

@@ -0,0 +1,191 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/main/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "accountPath": "m/44'/60'/2",
+        "name": "ERC1155Node",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "private": [
+          {
+            "config": {
+              "language": "javascript",
+              "name": "AddressStateArchivist",
+              "schema": "network.xyo.archivist.config",
+              "storeQueries": false
+            }
+          },
+          {
+            "config": {
+              "archivist": "AddressStateArchivist",
+              "language": "javascript",
+              "name": "AddressStateBoundWitnessDiviner",
+              "schema": "network.xyo.diviner.boundwitness.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "AddressStateArchivist",
+              "language": "javascript",
+              "name": "AddressStatePayloadDiviner",
+              "schema": "network.xyo.diviner.payload.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "NftDivinerIndexArchivist",
+              "schema": "network.xyo.archivist.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "NftDivinerIndexArchivist",
+              "language": "javascript",
+              "name": "NftDivinerIndexBoundWitnessDiviner",
+              "schema": "network.xyo.diviner.boundwitness.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "NftDivinerIndexArchivist",
+              "language": "javascript",
+              "name": "NftDivinerIndexPayloadDiviner",
+              "schema": "network.xyo.diviner.payload.config"
+            }
+          },
+          {
+            "config": {
+              "filter": {
+                "payload_schemas": ["network.xyo.crypto.contract.info.erc1155"]
+              },
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "stateToIndexCandidateDiviner"
+              },
+              "language": "javascript",
+              "name": "NftStateToIndexCandidateDiviner",
+              "payloadStore": {
+                "archivist": "NftArchivist",
+                "boundWitnessDiviner": "NftBoundWitnessDiviner",
+                "payloadDiviner": "NftPayloadDiviner"
+              },
+              "schema": "network.xyo.diviner.indexing.temporal.stage.stateToIndexCandidateDiviner.config"
+            }
+          },
+          {
+            "config": {
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "indexCandidateToIndexDiviner"
+              },
+              "language": "javascript",
+              "name": "NftIndexCandidateToNftIndexDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.indexCandidateToIndexDiviner.config",
+              "schemaTransforms": {
+                "network.xyo.crypto.contract.info.erc1155": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  }
+                ],
+                "network.xyo.timestamp": [
+                  {
+                    "destinationField": "timestamp",
+                    "sourcePathExpression": "$.timestamp"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "divinerQuerySchema": "network.xyo.diviner.payload.query",
+              "indexQuerySchema": "network.xyo.diviner.payload.query",
+              "indexSchema": "network.xyo.diviner.indexing.temporal.result.index",
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "divinerQueryToIndexQueryDiviner"
+              },
+              "language": "javascript",
+              "name": "NftQueryToNftIndexQueryDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.divinerQueryToIndexQueryDiviner.config",
+              "schemaTransforms": {
+                "network.xyo.diviner.payload.query": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "defaultValue": 1,
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  },
+                  {
+                    "defaultValue": 1,
+                    "destinationField": "limit",
+                    "sourcePathExpression": "$.limit"
+                  },
+                  {
+                    "defaultValue": 0,
+                    "destinationField": "offset",
+                    "sourcePathExpression": "$.offset"
+                  },
+                  {
+                    "defaultValue": "desc",
+                    "destinationField": "order",
+                    "sourcePathExpression": "$.order"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "indexQueryResponseToDivinerQueryResponseDiviner"
+              },
+              "language": "javascript",
+              "name": "NftIndexQueryResponseToNftQueryResponseDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.indexQueryResponseToDivinerQueryResponseDiviner.config"
+            }
+          }
+        ],
+        "public": [
+          {
+            "config": {
+              "indexStore": {
+                "archivist": "NftDivinerIndexArchivist",
+                "boundWitnessDiviner": "NftDivinerIndexBoundWitnessDiviner",
+                "payloadDiviner": "NftDivinerIndexPayloadDiviner"
+              },
+              "indexingDivinerStages": {
+                "divinerQueryToIndexQueryDiviner": "NftQueryToNftIndexQueryDiviner",
+                "indexCandidateToIndexDiviner": "NftIndexCandidateToNftIndexDiviner",
+                "indexQueryResponseToDivinerQueryResponseDiviner": "NftIndexQueryResponseToNftQueryResponseDiviner",
+                "stateToIndexCandidateDiviner": "NftStateToIndexCandidateDiviner"
+              },
+              "language": "javascript",
+              "name": "Erc1155IndexDiviner",
+              "pollFrequency": 1,
+              "schema": "network.xyo.diviner.indexing.temporal.config",
+              "stateStore": {
+                "archivist": "AddressStateArchivist",
+                "boundWitnessDiviner": "AddressStateBoundWitnessDiviner",
+                "payloadDiviner": "AddressStatePayloadDiviner"
+              }
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}

package/src/spec/imported/AddressToContract/AddressToContractIndex/Contract.Sentinel.Erc721.Index.json

@@ -0,0 +1,191 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/main/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "accountPath": "m/44'/60'/1",
+        "name": "ERC721Node",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "private": [
+          {
+            "config": {
+              "language": "javascript",
+              "name": "AddressStateArchivist",
+              "schema": "network.xyo.archivist.config",
+              "storeQueries": false
+            }
+          },
+          {
+            "config": {
+              "archivist": "AddressStateArchivist",
+              "language": "javascript",
+              "name": "AddressStateBoundWitnessDiviner",
+              "schema": "network.xyo.diviner.boundwitness.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "AddressStateArchivist",
+              "language": "javascript",
+              "name": "AddressStatePayloadDiviner",
+              "schema": "network.xyo.diviner.payload.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "NftDivinerIndexArchivist",
+              "schema": "network.xyo.archivist.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "NftDivinerIndexArchivist",
+              "language": "javascript",
+              "name": "NftDivinerIndexBoundWitnessDiviner",
+              "schema": "network.xyo.diviner.boundwitness.config"
+            }
+          },
+          {
+            "config": {
+              "archivist": "NftDivinerIndexArchivist",
+              "language": "javascript",
+              "name": "NftDivinerIndexPayloadDiviner",
+              "schema": "network.xyo.diviner.payload.config"
+            }
+          },
+          {
+            "config": {
+              "filter": {
+                "payload_schemas": ["network.xyo.crypto.contract.info.erc721"]
+              },
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "stateToIndexCandidateDiviner"
+              },
+              "language": "javascript",
+              "name": "NftStateToIndexCandidateDiviner",
+              "payloadStore": {
+                "archivist": "NftArchivist",
+                "boundWitnessDiviner": "NftBoundWitnessDiviner",
+                "payloadDiviner": "NftPayloadDiviner"
+              },
+              "schema": "network.xyo.diviner.indexing.temporal.stage.stateToIndexCandidateDiviner.config"
+            }
+          },
+          {
+            "config": {
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "indexCandidateToIndexDiviner"
+              },
+              "language": "javascript",
+              "name": "NftIndexCandidateToNftIndexDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.indexCandidateToIndexDiviner.config",
+              "schemaTransforms": {
+                "network.xyo.crypto.contract.info.erc721": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  }
+                ],
+                "network.xyo.timestamp": [
+                  {
+                    "destinationField": "timestamp",
+                    "sourcePathExpression": "$.timestamp"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "divinerQuerySchema": "network.xyo.diviner.payload.query",
+              "indexQuerySchema": "network.xyo.diviner.payload.query",
+              "indexSchema": "network.xyo.diviner.indexing.temporal.result.index",
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "divinerQueryToIndexQueryDiviner"
+              },
+              "language": "javascript",
+              "name": "NftQueryToNftIndexQueryDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.divinerQueryToIndexQueryDiviner.config",
+              "schemaTransforms": {
+                "network.xyo.diviner.payload.query": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "defaultValue": 1,
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  },
+                  {
+                    "defaultValue": 1,
+                    "destinationField": "limit",
+                    "sourcePathExpression": "$.limit"
+                  },
+                  {
+                    "defaultValue": 0,
+                    "destinationField": "offset",
+                    "sourcePathExpression": "$.offset"
+                  },
+                  {
+                    "defaultValue": "desc",
+                    "destinationField": "order",
+                    "sourcePathExpression": "$.order"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "labels": {
+                "network.xyo.crypto.contract.info": "diviner",
+                "network.xyo.diviner.stage": "indexQueryResponseToDivinerQueryResponseDiviner"
+              },
+              "language": "javascript",
+              "name": "NftIndexQueryResponseToNftQueryResponseDiviner",
+              "schema": "network.xyo.diviner.indexing.temporal.stage.indexQueryResponseToDivinerQueryResponseDiviner.config"
+            }
+          }
+        ],
+        "public": [
+          {
+            "config": {
+              "indexStore": {
+                "archivist": "NftDivinerIndexArchivist",
+                "boundWitnessDiviner": "NftDivinerIndexBoundWitnessDiviner",
+                "payloadDiviner": "NftDivinerIndexPayloadDiviner"
+              },
+              "indexingDivinerStages": {
+                "divinerQueryToIndexQueryDiviner": "NftQueryToNftIndexQueryDiviner",
+                "indexCandidateToIndexDiviner": "NftIndexCandidateToNftIndexDiviner",
+                "indexQueryResponseToDivinerQueryResponseDiviner": "NftIndexQueryResponseToNftQueryResponseDiviner",
+                "stateToIndexCandidateDiviner": "NftStateToIndexCandidateDiviner"
+              },
+              "language": "javascript",
+              "name": "Erc721IndexDiviner",
+              "pollFrequency": 1,
+              "schema": "network.xyo.diviner.indexing.temporal.config",
+              "stateStore": {
+                "archivist": "AddressStateArchivist",
+                "boundWitnessDiviner": "AddressStateBoundWitnessDiviner",
+                "payloadDiviner": "AddressStatePayloadDiviner"
+              }
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}