@xyo-network/evm-call-witness 2.84.2 → 2.84.3

package/src/Witness.ts

@@ -1,42 +1,14 @@
 import { assertEx } from '@xylabs/assert'
+import { isHexZero } from '@xylabs/hex'
 import { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'
 import { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
-import { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'
-import { Contract, JsonFragment } from 'ethers'
+import { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-abstract'
+import { Contract } from 'ethers'
 
+import { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'
 import { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'
 
-export type Abi = string | ReadonlyArray<JsonFragment | string>
-
-export const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'
-export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema
-
-export type EvmCallWitnessConfig = BlockchainWitnessConfig<
-  {
-    abi?: Abi
-    address?: string
-    args?: unknown[]
-    block?: number
-    functionName?: string
-  },
-  EvmCallWitnessConfigSchema
->
-
-export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>
-
-const prefixHex = (value?: string) => {
-  if (value !== undefined) {
-    const lowerValue = value.toLowerCase()
-    return lowerValue.startsWith('0x') ? lowerValue : `0x${lowerValue}`
-  }
-}
-
-const isHexZero = (value?: string) => {
-  const prefixedValue = prefixHex(value)
-  return prefixedValue === undefined ? true : BigInt(prefixedValue) === 0n
-}
-
 export class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<
   TParams,
   EvmCall,
@@ -54,7 +26,7 @@ export class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnes
     await this.getProviders()
     try {
       const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {
+        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {
           const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')
           const validatedFunctionName = assertEx(functionName ?? this.config.functionName, 'Missing address')
           const mergedArgs = [...(args ?? this.config.args ?? [])]
@@ -69,7 +41,7 @@ export class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnes
           //Check if ERC-1822 Upgradeable
           const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)
 
-          const implementation = isHexZero(erc1967Status.slots.implementation) ? erc1822Status.implementation : erc1967Status.implementation
+          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation
 
           const contract = new Contract(implementation, this.abi, provider)
           let transformedResult: unknown

package/src/index.ts

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

package/src/model.ts

@@ -0,0 +1,20 @@
+import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'
+import { JsonFragment } from 'ethers'
+
+export type Abi = string | ReadonlyArray<JsonFragment | string>
+
+export const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'
+export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema
+
+export type EvmCallWitnessConfig = BlockchainWitnessConfig<
+  {
+    abi?: Abi
+    address?: string
+    args?: unknown[]
+    block?: number
+    functionName?: string
+  },
+  EvmCallWitnessConfigSchema
+>
+
+export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>

package/src/spec/Erc721TokenEnumerateSentinel.json

@@ -0,0 +1,387 @@
+{
+  "$schema": "https://raw.githubusercontent.com/XYOracleNetwork/sdk-xyo-client-js/main/packages/manifest/src/schema.json",
+  "nodes": [
+    {
+      "config": {
+        "name": "Erc721TokenInfo",
+        "schema": "network.xyo.node.config"
+      },
+      "modules": {
+        "public": [
+          {
+            "config": {
+              "labels": {
+                "network.xyo.evm.interface": "Erc721UriStorage"
+              },
+              "language": "javascript",
+              "name": "Erc721TokenURIWitness",
+              "schema": "network.xyo.evm.call.witness.config"
+            }
+          },
+          {
+            "config": {
+              "labels": {
+                "network.xyo.evm.interface": "Erc721"
+              },
+              "language": "javascript",
+              "name": "Erc721OwnerOfWitness",
+              "schema": "network.xyo.evm.call.witness.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "Erc1822Witness",
+              "schema": "network.xyo.erc1822.witness.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "NumberZeroWitness",
+              "payload": {
+                "schema": "network.xyo.number",
+                "value": 0
+              },
+              "schema": "network.xyo.witness.adhoc.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "Erc1967Witness",
+              "schema": "network.xyo.erc1967.witness.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "TokenInfoDiviner",
+              "schema": "network.xyo.evm.call.diviner.config"
+            }
+          },
+          {
+            "config": {
+              "destinationSchema": "network.xyo.blockchain.address",
+              "language": "javascript",
+              "name": "Erc1822ToAddressDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config",
+              "schemaTransforms": {
+                "network.xyo.erc1822.status": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.implementation"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  },
+                  {
+                    "destinationField": "blockTag",
+                    "sourcePathExpression": "$.block"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "destinationSchema": "network.xyo.blockchain.address",
+              "language": "javascript",
+              "name": "Erc1967ToAddressDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config",
+              "schemaTransforms": {
+                "network.xyo.erc1967.status": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.implementation"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  },
+                  {
+                    "destinationField": "blockTag",
+                    "sourcePathExpression": "$.block"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "destinationSchema": "network.xyo.evm.call",
+              "language": "javascript",
+              "name": "ErcTokenInterfaceToCallDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config",
+              "schemaTransforms": {
+                "network.xyo.evm.token.interface.implemented": [
+                  {
+                    "destinationField": "address",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "ContractWitness",
+              "schema": "network.xyo.evm.contract.witness.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "TokenInterfaceDiviner",
+              "schema": "network.xyo.evm.token.interface.implemented.diviner.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "TokenInterfaceToErc721EnumerableInterfaceDiviner",
+              "operations": [
+                {
+                  "op": "test",
+                  "path": "/schema",
+                  "value": "network.xyo.evm.token.interface.implemented"
+                },
+                {
+                  "op": "test",
+                  "path": "/tokenInterface",
+                  "value": "ERC721Enumerable"
+                },
+                {
+                  "op": "test",
+                  "path": "/implemented",
+                  "value": true
+                }
+              ],
+              "schema": "network.xyo.diviner.jsonpatch.config"
+            }
+          },
+          {
+            "config": {
+              "functionName": "totalSupply",
+              "labels": {
+                "network.xyo.evm.interface": "Erc721Enumerable"
+              },
+              "language": "javascript",
+              "name": "Erc721TotalSupplyWitness",
+              "schema": "network.xyo.evm.call.witness.config"
+            }
+          },
+          {
+            "config": {
+              "destinationSchema": "network.xyo.range",
+              "language": "javascript",
+              "name": "TotalSupplyToRangeDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config",
+              "schemaTransforms": {
+                "network.xyo.evm.call.result": [
+                  {
+                    "destinationField": "start",
+                    "sourcePathExpression": "$.address"
+                  },
+                  {
+                    "destinationField": "chainId",
+                    "sourcePathExpression": "$.chainId"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "destinationSchema": "network.xyo.blockchain.address",
+              "language": "javascript",
+              "name": "Erc721EnumerableInterfaceToRangeDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config",
+              "schemaTransforms": {
+                "network.xyo.evm.token.interface.implemented": [
+                  {
+                    "destinationField": "start",
+                    "sourcePathExpression": 1
+                  },
+                  {
+                    "destinationField": "count",
+                    "sourcePathExpression": 10
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "Erc721RangeDiviner",
+              "schema": "network.xyo.diviner.range.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "Erc721RangeToCallsDiviner",
+              "schema": "network.xyo.diviner.jsonpath.aggregate.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "Erc721CallWitness",
+              "schema": "network.xyo.evm.call.witness.config"
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "NftTokenInfoAllSentinel",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "Erc1822Witness"
+                },
+                {
+                  "input": [
+                    "Erc1822Witness"
+                  ],
+                  "module": "Erc1822ToAddressDiviner"
+                },
+                {
+                  "input": [
+                    "Erc1822ToAddressDiviner"
+                  ],
+                  "module": "Erc1967Witness"
+                },
+                {
+                  "input": [
+                    "Erc1967Witness"
+                  ],
+                  "module": "Erc1967ToAddressDiviner"
+                },
+                {
+                  "input": [
+                    "Erc1967ToAddressDiviner"
+                  ],
+                  "module": "ContractWitness"
+                },
+                {
+                  "input": [
+                    "ContractWitness"
+                  ],
+                  "module": "TokenInterfaceDiviner"
+                },
+                {
+                  "input": [
+                    "TokenInterfaceDiviner"
+                  ],
+                  "module": "TokenInterfaceToRangeDiviner"
+                },
+                {
+                  "input": [
+                    "TokenInterfaceToRangeDiviner"
+                  ],
+                  "module": "Erc721RangeDiviner"
+                },
+                {
+                  "input": [
+                    "Erc721RangeDiviner"
+                  ],
+                  "module": "Erc721RangeToCallsDiviner"
+                },
+                {
+                  "input": [
+                    "Erc721RangeToCallsDiviner"
+                  ],
+                  "module": "Erc721CallWitness"
+                },
+                {
+                  "input": [
+                    "Erc721CallWitness"
+                  ],
+                  "module": "TokenInfoDiviner"
+                }
+              ]
+            }
+          },
+          {
+            "config": {
+              "language": "javascript",
+              "name": "NftTokenInfoAllSentinelDebug",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "NumberZeroWitness"
+                },
+                {
+                  "input": true,
+                  "module": "Erc1822Witness"
+                },
+                {
+                  "input": [
+                    "Erc1822Witness"
+                  ],
+                  "module": "Erc1822ToAddressDiviner"
+                },
+                {
+                  "input": [
+                    "Erc1822ToAddressDiviner"
+                  ],
+                  "module": "Erc1967Witness"
+                },
+                {
+                  "input": [
+                    "Erc1967Witness"
+                  ],
+                  "module": "Erc1967ToAddressDiviner"
+                },
+                {
+                  "input": [
+                    "Erc1967ToAddressDiviner"
+                  ],
+                  "module": "ContractWitness"
+                },
+                {
+                  "input": [
+                    "ContractWitness"
+                  ],
+                  "module": "TokenInterfaceDiviner"
+                },
+                {
+                  "input": [
+                    "TokenInterfaceDiviner"
+                  ],
+                  "module": "TokenInterfaceToErc721EnumerableInterfaceDiviner"
+                },
+                {
+                  "input": [
+                    "TokenInterfaceToErc721EnumerableInterfaceDiviner"
+                  ],
+                  "module": "ErcTokenInterfaceToCallDiviner"
+                },
+                {
+                  "input": [
+                    "ErcTokenInterfaceToCallDiviner",
+                    "NumberZeroWitness"
+                  ],
+                  "module": "Erc721TotalSupplyWitness"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "schema": "network.xyo.manifest"
+}