@xyo-network/crypto-contract-function-read-plugin 2.85.0 → 2.85.2

package/package.json

@@ -10,41 +10,41 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.13.20",
-    "@xylabs/promise": "^2.13.20",
-    "@xyo-network/abstract-diviner": "^2.85.0",
-    "@xyo-network/abstract-witness": "^2.85.0",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.85.0",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
-    "@xyo-network/payloadset-plugin": "^2.85.0",
-    "@xyo-network/witness-model": "^2.85.0",
-    "ethers": "^6.9.1"
+    "@xylabs/assert": "^2.13.23",
+    "@xylabs/promise": "^2.13.23",
+    "@xyo-network/abstract-witness": "^2.85.8",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.85.2",
+    "@xyo-network/crypto-nft-payload-plugin": "~2.85.2",
+    "@xyo-network/diviner-abstract": "^2.85.8",
+    "@xyo-network/module-model": "^2.85.8",
+    "@xyo-network/payload-model": "^2.85.8",
+    "@xyo-network/payloadset-plugin": "^2.85.8",
+    "@xyo-network/witness-model": "^2.85.8",
+    "ethers": "^6.9.2"
   },
   "devDependencies": {
-    "@xylabs/delay": "^2.13.20",
-    "@xylabs/hex": "^2.13.20",
-    "@xylabs/jest-helpers": "^2.13.20",
+    "@xylabs/delay": "^2.13.23",
+    "@xylabs/hex": "^2.13.23",
+    "@xylabs/jest-helpers": "^2.13.23",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig": "^3.2.25",
-    "@xyo-network/account": "^2.85.0",
-    "@xyo-network/diviner-boundwitness-memory": "^2.85.0",
-    "@xyo-network/diviner-jsonpatch": "^2.85.0",
-    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.0",
-    "@xyo-network/diviner-model": "^2.85.0",
-    "@xyo-network/diviner-payload-memory": "^2.85.0",
-    "@xyo-network/diviner-payload-model": "^2.85.0",
-    "@xyo-network/diviner-range": "^2.85.0",
-    "@xyo-network/diviner-temporal-indexing": "^2.85.0",
-    "@xyo-network/evm-nft-id-payload-plugin": "~2.85.0",
-    "@xyo-network/manifest": "^2.85.0",
-    "@xyo-network/memory-archivist": "^2.85.0",
-    "@xyo-network/node-memory": "^2.85.0",
+    "@xyo-network/account": "^2.85.8",
+    "@xyo-network/archivist-memory": "^2.85.8",
+    "@xyo-network/diviner-boundwitness-memory": "^2.85.8",
+    "@xyo-network/diviner-jsonpatch": "^2.85.8",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.8",
+    "@xyo-network/diviner-model": "^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-nft-id-payload-plugin": "~2.85.2",
+    "@xyo-network/manifest": "^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-blockchain-abstract": "^2.85.0",
-    "@xyo-network/witness-timestamp": "^2.85.0",
+    "@xyo-network/sentinel-model": "^2.85.8",
+    "@xyo-network/witness-blockchain-abstract": "^2.85.8",
+    "@xyo-network/witness-timestamp": "^2.85.8",
     "async-mutex": "^0.4.0",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
@@ -88,6 +88,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.85.0",
+  "version": "2.85.2",
   "type": "module"
 }

package/src/Diviner/Diviner.ts

@@ -1,6 +1,5 @@
 import { assertEx } from '@xylabs/assert'
 import { Promisable } from '@xylabs/promise'
-import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import {
   asCryptoContractFunctionCallSuccess,
   ContractInfo,
@@ -11,10 +10,13 @@ import {
   CryptoContractFunctionCallResult,
   CryptoContractFunctionCallResultSchema,
 } from '@xyo-network/crypto-contract-function-read-payload-plugin'
+import { AbstractDiviner } from '@xyo-network/diviner-abstract'
 import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
+/** @deprecated use EvmCallDiviner instead */
 export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]
 
+/** @deprecated use EvmCallDiviner instead */
 export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {
   static override configSchemas = [CryptoContractDivinerConfigSchema]
   static labels: CryptoContractDivinerLabels = CryptoContractDivinerLabels
@@ -30,6 +32,7 @@ export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams =
 
   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)
@@ -47,6 +50,7 @@ export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams =
   protected override async divineHandler(inPayloads: CryptoContractFunctionCallResult[] = []): Promise<ContractInfo[]> {
     const callResults = inPayloads.filter(isPayloadOfSchemaType<CryptoContractFunctionCallResult>(CryptoContractFunctionCallResultSchema))
     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
@@ -58,7 +62,7 @@ export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams =
       addresses.map(async (address) => {
         const foundCallResults = callResults.filter((callResult) => callResult.address === address)
         const info: ContractInfo = {
-          ...{ results: await this.reduceResults(foundCallResults) },
+          results: await this.reduceResults(foundCallResults),
           ...this.contractInfoRequiredFields(foundCallResults),
         }
         return info
@@ -69,6 +73,7 @@ export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams =
   }
 
   protected reduceResults(callResults: CryptoContractFunctionCallResult[]): Promisable<ContractInfo['results']> {
+    // eslint-disable-next-line unicorn/no-array-reduce
     return callResults.reduce<Record<string, unknown>>((prev, callResult) => {
       prev[callResult.functionName] = asCryptoContractFunctionCallSuccess(callResult)?.result
       return prev

package/src/Plugin.ts

@@ -1,9 +1,11 @@
+/* eslint-disable import/no-deprecated */
 import { NftSchema } from '@xyo-network/crypto-nft-payload-plugin'
 import { PayloadSetSchema } from '@xyo-network/payload-model'
 import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
 import { CryptoContractFunctionReadWitness } from './Witness'
 
+/** @deprecated use EvmCallWitness instead */
 export const CryptoContractFunctionReadWitnessPlugin = () =>
   createPayloadSetWitnessPlugin<CryptoContractFunctionReadWitness>(
     { required: { [NftSchema]: 1 }, schema: PayloadSetSchema },

package/src/Witness.ts

@@ -15,6 +15,7 @@ import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import { WitnessParams } from '@xyo-network/witness-model'
 import { Contract, Provider } from 'ethers'
 
+/** @deprecated use EvmCallWitness instead */
 export type CryptoContractFunctionReadWitnessParams = WitnessParams<
   AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,
   {
@@ -22,6 +23,7 @@ export type CryptoContractFunctionReadWitnessParams = WitnessParams<
   }
 >
 
+/** @deprecated use EvmCallWitness instead */
 export class CryptoContractFunctionReadWitness<
   TParams extends CryptoContractFunctionReadWitnessParams = CryptoContractFunctionReadWitnessParams,
 > extends AbstractWitness<TParams, CryptoContractFunctionCall, CryptoContractFunctionCallResult> {

package/src/index.ts

@@ -1,9 +1,3 @@
-import { CryptoContractFunctionReadWitnessPlugin } from './Plugin'
-
 export * from './Diviner'
+export { CryptoContractFunctionReadWitnessPlugin, CryptoContractFunctionReadWitnessPlugin as default } from './Plugin'
 export * from './Witness'
-
-export { CryptoContractFunctionReadWitnessPlugin }
-
-// eslint-disable-next-line import/no-default-export
-export default CryptoContractFunctionReadWitnessPlugin

package/src/spec/AddressToContract/AddressToContractIndex/Contract.Sentinel.Node.json

@@ -20,7 +20,7 @@
             "config": {
               "functionName": "name",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721NameWitness",
@@ -32,7 +32,7 @@
             "config": {
               "functionName": "symbol",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721SymbolWitness",
@@ -44,7 +44,7 @@
             "config": {
               "functionName": "tokenURI",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721TokenURIWitness",
@@ -55,7 +55,7 @@
             "config": {
               "functionName": "ownerOf",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721OwnerOfWitness",
@@ -66,7 +66,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TotalSupplyWitness",
@@ -76,10 +76,12 @@
           },
           {
             "config": {
-              "args": ["0x1"],
+              "args": [
+                "0x1"
+              ],
               "functionName": "uri",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc1155"
+                "network.xyo.evm.interface": "Erc1155"
               },
               "language": "javascript",
               "name": "Erc1155UriWitness",
@@ -111,9 +113,18 @@
                   "path": "/schema",
                   "value": "network.xyo.crypto.contract.info"
                 },
-                { "op": "defined", "path": "/results/name" },
-                { "op": "defined", "path": "/results/symbol" },
-                { "op": "defined", "path": "/results/totalSupply" },
+                {
+                  "op": "defined",
+                  "path": "/results/name"
+                },
+                {
+                  "op": "defined",
+                  "path": "/results/symbol"
+                },
+                {
+                  "op": "defined",
+                  "path": "/results/totalSupply"
+                },
                 {
                   "op": "replace",
                   "path": "/schema",
@@ -133,7 +144,10 @@
                   "path": "/schema",
                   "value": "network.xyo.crypto.contract.info"
                 },
-                { "op": "defined", "path": "/results/uri" },
+                {
+                  "op": "defined",
+                  "path": "/results/uri"
+                },
                 {
                   "op": "replace",
                   "path": "/schema",
@@ -171,7 +185,9 @@
           {
             "config": {
               "archiving": {
-                "archivists": ["NftArchivist"]
+                "archivists": [
+                  "NftArchivist"
+                ]
               },
               "language": "javascript",
               "name": "NftInfoSentinel",
@@ -203,23 +219,33 @@
                   "module": "Erc721ContractInfoDiviner"
                 },
                 {
-                  "input": ["Erc1155UriWitness"],
+                  "input": [
+                    "Erc1155UriWitness"
+                  ],
                   "module": "Erc1155ContractInfoDiviner"
                 },
                 {
-                  "input": ["Erc721ContractInfoDiviner"],
+                  "input": [
+                    "Erc721ContractInfoDiviner"
+                  ],
                   "module": "Erc721ContractInfoTransformDiviner"
                 },
                 {
-                  "input": ["Erc721ContractInfoDiviner"],
+                  "input": [
+                    "Erc721ContractInfoDiviner"
+                  ],
                   "module": "TimestampWitness"
                 },
                 {
-                  "input": ["Erc1155ContractInfoDiviner"],
+                  "input": [
+                    "Erc1155ContractInfoDiviner"
+                  ],
                   "module": "Erc1155ContractInfoTransformDiviner"
                 },
                 {
-                  "input": ["Erc1155ContractInfoDiviner"],
+                  "input": [
+                    "Erc1155ContractInfoDiviner"
+                  ],
                   "module": "TimestampWitness"
                 }
               ]
@@ -230,4 +256,4 @@
     }
   ],
   "schema": "network.xyo.manifest"
-}
+}

package/src/spec/AddressToContract/Erc721Sentinel.json

@@ -12,7 +12,7 @@
             "config": {
               "functionName": "name",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721NameWitness",
@@ -24,7 +24,7 @@
             "config": {
               "functionName": "symbol",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721SymbolWitness",
@@ -36,7 +36,7 @@
             "config": {
               "functionName": "tokenURI",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721TokenURIWitness",
@@ -47,7 +47,7 @@
             "config": {
               "functionName": "ownerOf",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721OwnerOfWitness",
@@ -58,7 +58,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TotalSupplyWitness",
@@ -70,7 +70,7 @@
             "config": {
               "functionName": "tokenByIndex",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TokenByIndexWitness",
@@ -81,7 +81,7 @@
             "config": {
               "functionName": "uri",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc1155"
+                "network.xyo.evm.interface": "Erc1155"
               },
               "language": "javascript",
               "name": "Erc1155UriWitness",

package/src/spec/AddressToTotalSupplyIndex/Erc721.TotalSupply.Index.json

@@ -155,7 +155,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "name": "Erc721TotalSupplyWitness",
               "schema": "network.xyo.crypto.contract.function.read.config"
@@ -214,7 +214,9 @@
           {
             "config": {
               "archiving": {
-                "archivists": ["Archivist"]
+                "archivists": [
+                  "Archivist"
+                ]
               },
               "language": "javascript",
               "name": "Sentinel",
@@ -237,4 +239,4 @@
     }
   ],
   "schema": "network.xyo.manifest"
-}
+}