@xyo-network/crypto-contract-function-read-plugin 2.77.20 → 2.78.1

package/src/Erc721Sentinel.json

@@ -3,7 +3,6 @@
   "nodes": [
     {
       "config": {
-        "accountPath": "m/44'/60'/1'/0'/0'",
         "name": "NftInfo",
         "schema": "network.xyo.node.config"
       },
@@ -11,11 +10,8 @@
         "public": [
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/0'",
-              "call": {
-                "functionName": "name",
-                "params": []
-              },
+              "functionName": "name",
+              "params": [],
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721"
               },
@@ -26,11 +22,8 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/1'",
-              "call": {
-                "functionName": "symbol",
-                "params": []
-              },
+              "functionName": "symbol",
+              "params": [],
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721"
               },
@@ -41,10 +34,7 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/2'",
-              "call": {
-                "functionName": "tokenURI"
-              },
+              "functionName": "tokenURI",
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721"
               },
@@ -55,10 +45,7 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/3'",
-              "call": {
-                "functionName": "ownerOf"
-              },
+              "functionName": "ownerOf",
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721"
               },
@@ -69,11 +56,8 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/4'",
-              "call": {
-                "functionName": "totalSupply",
-                "params": []
-              },
+              "functionName": "totalSupply",
+              "params": [],
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721Enumerable"
               },
@@ -84,10 +68,7 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/5'",
-              "call": {
-                "functionName": "tokenByIndex"
-              },
+              "functionName": "tokenByIndex",
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc721Enumerable"
               },
@@ -98,11 +79,8 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/8'",
-              "call": {
-                "functionName": "uri",
-                "params": []
-              },
+              "functionName": "uri",
+              "params": [],
               "labels": {
                 "network.xyo.crypto.contract.interface": "Erc1155"
               },
@@ -113,7 +91,6 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/2'/0'",
               "language": "javascript",
               "name": "Erc721ContractInfoDiviner",
               "schema": "network.xyo.crypto.contract.diviner.config"
@@ -121,7 +98,6 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/2'/1'",
               "language": "javascript",
               "name": "Erc1155ContractInfoDiviner",
               "schema": "network.xyo.crypto.contract.diviner.config"
@@ -129,7 +105,6 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/3'/0'",
               "language": "javascript",
               "name": "NftInfoSentinel",
               "schema": "network.xyo.sentinel.config",
@@ -170,7 +145,6 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/3'/1'",
               "language": "javascript",
               "name": "NftTokenInfoSentinel",
               "schema": "network.xyo.sentinel.config",
@@ -178,32 +152,7 @@
               "tasks": [
                 {
                   "input": true,
-                  "module": "Erc721NameWitness"
-                },
-                {
-                  "input": true,
-                  "module": "Erc721SymbolWitness"
-                },
-                {
-                  "input": true,
-                  "module": "Erc721TotalSupplyWitness"
-                },
-                {
-                  "input": true,
-                  "module": "Erc1155UriWitness"
-                },
-                {
-                  "input": [
-                    "Erc721TokenURIWitness",
-                    "Erc721OwnerOfWitness"
-                  ],
-                  "module": "Erc721TokenContractInfoDiviner"
-                },
-                {
-                  "input": [
-                    "Erc1155UriWitness"
-                  ],
-                  "module": "Erc1155TokenContractInfoDiviner"
+                  "module": "Erc721TokenByIndexWitness"
                 }
               ]
             }

package/src/Witness.ts

@@ -1,67 +1,78 @@
+import { BigNumber } from '@ethersproject/bignumber'
+import { Contract } from '@ethersproject/contracts'
+import { JsonRpcProvider } from '@ethersproject/providers'
 import { assertEx } from '@xylabs/assert'
 import { AbstractWitness } from '@xyo-network/abstract-witness'
 import {
   CryptoContractFunctionCall,
+  CryptoContractFunctionCallFailure,
   CryptoContractFunctionCallResult,
   CryptoContractFunctionCallResultSchema,
   CryptoContractFunctionCallSchema,
+  CryptoContractFunctionCallSuccess,
   CryptoContractFunctionReadWitnessConfig,
   CryptoContractFunctionReadWitnessConfigSchema,
 } from '@xyo-network/crypto-contract-function-read-payload-plugin'
-import { PayloadHasher } from '@xyo-network/hash'
 import { AnyConfigSchema } from '@xyo-network/module-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import { WitnessParams } from '@xyo-network/witness-model'
-import { BigNumber, Contract } from 'ethers'
 
-export type CryptoContractFunctionReadWitnessParams<TContract extends Contract> = WitnessParams<
+export type CryptoContractFunctionReadWitnessParams = WitnessParams<
   AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,
   {
-    factory: (address: string) => TContract
+    providers: JsonRpcProvider[]
   }
 >
 
 export class CryptoContractFunctionReadWitness<
-  TContract extends Contract = Contract,
-  TParams extends CryptoContractFunctionReadWitnessParams<TContract> = CryptoContractFunctionReadWitnessParams<TContract>,
-> extends AbstractWitness<TParams, CryptoContractFunctionCall<keyof TContract['callStatic']>, CryptoContractFunctionCallResult> {
+  TParams extends CryptoContractFunctionReadWitnessParams = CryptoContractFunctionReadWitnessParams,
+> extends AbstractWitness<TParams, CryptoContractFunctionCall, CryptoContractFunctionCallResult> {
   static override configSchemas = [CryptoContractFunctionReadWitnessConfigSchema]
 
-  protected override async observeHandler(
-    inPayloads: CryptoContractFunctionCall<keyof TContract['callStatic']>[] = [],
-  ): Promise<CryptoContractFunctionCallResult[]> {
+  protected override async observeHandler(inPayloads: CryptoContractFunctionCall[] = []): Promise<CryptoContractFunctionCallResult[]> {
     await this.started('throw')
     try {
       const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {
-          const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload }
-          const { address, functionName, params } = fullCallPayload
-          const validatedAddress = assertEx(address, 'Missing address')
-          const validatedFunctionName = assertEx(functionName, 'Missing functionName')
-          const contract = this.params.factory(validatedAddress)
-          const func = assertEx(contract.callStatic[validatedFunctionName], `functionName [${validatedFunctionName}] not found`)
-          const rawResult = await func(...(params ?? []))
-          const result: CryptoContractFunctionCallResult['result'] = BigNumber.isBigNumber(rawResult)
-            ? { type: 'BigNumber', value: rawResult.toHexString() }
-            : { value: rawResult }
-          const observation: CryptoContractFunctionCallResult = {
-            address: validatedAddress,
-            call: await PayloadHasher.hashAsync(fullCallPayload),
-            chainId: (await contract.provider.getNetwork()).chainId,
-            functionName: validatedFunctionName,
-            params,
-            result,
-            schema: CryptoContractFunctionCallResultSchema,
+        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async ({ functionName, args, address }) => {
+          const { providers } = this.params
+          const provider = providers[Date.now() % providers.length] //pick a random provider
+          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')
+          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, 'Missing address')
+          const mergedArgs = [...(args ?? this.config.args ?? [])]
+
+          const contract = new Contract(validatedAddress, this.config.contract, provider)
+          try {
+            const result = await contract.callStatic[validatedFunctionName](...mergedArgs)
+            const transformedResult = BigNumber.isBigNumber(result) ? result.toHexString() : result
+            const observation: CryptoContractFunctionCallSuccess = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              functionName: validatedFunctionName,
+              result: transformedResult,
+              schema: CryptoContractFunctionCallResultSchema,
+            }
+            return observation
+          } catch (ex) {
+            const error = ex as Error & { code: string }
+            console.log(`Error [${this.config.name}]: ${error.code}`)
+            const observation: CryptoContractFunctionCallFailure = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              error: error.code,
+              functionName: validatedFunctionName,
+              schema: CryptoContractFunctionCallResultSchema,
+            }
+            return observation
           }
-          return observation
         }),
       )
-      return observations.flat()
+      return observations
     } catch (ex) {
       const error = ex as Error
       console.log(`Error [${this.config.name}]: ${error.message}`)
+      throw error
     }
-
-    return []
   }
 }