@xyo-network/diviner-evm-call-result-to-token-uri 3.4.4 → 3.4.6

package/dist/neutral/index.mjs

@@ -5,151 +5,16 @@ var EvmCallResultToNftTokenUriDivinerSchema = "network.xyo.evm.call.results.meta
 var EvmCallResultToNftTokenUriDivinerConfigSchema = `${EvmCallResultToNftTokenUriDivinerSchema}.config`;
 
 // src/Diviner.ts
-import { AbstractDiviner as AbstractDiviner2 } from "@xyo-network/diviner-abstract";
-import { NftMetadataUriSchema } from "@xyo-network/evm-nft-id-payload-plugin";
-import { isPayloadOfSchemaType as isPayloadOfSchemaType4 } from "@xyo-network/payload-model";
-
-// ../../../dist/neutral/index.mjs
-import { assertEx } from "@xylabs/assert";
 import { AbstractDiviner } from "@xyo-network/diviner-abstract";
-import { isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
+import { EvmCallResultsSchema } from "@xyo-network/evm-call-witness";
+import { NftMetadataUriSchema } from "@xyo-network/evm-nft-id-payload-plugin";
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
-import { assertEx as assertEx2 } from "@xylabs/assert";
-import { isHexZero } from "@xylabs/hex";
-import { getErc1822SlotStatus } from "@xyo-network/erc1822-witness";
-import { getErc1967SlotStatus } from "@xyo-network/erc1967-witness";
-import { isPayloadOfSchemaType as isPayloadOfSchemaType3 } from "@xyo-network/payload-model";
-import { AbstractEvmWitness } from "@xyo-network/witness-evm-abstract";
-import { Contract } from "ethers";
-var EvmCallDivinerLabels = { "network.xyo.crypto.contract.info": "diviner" };
-var EvmCallSchema = "network.xyo.evm.call";
-var EvmCallResultSchema = "network.xyo.evm.call.result";
-var isEvmCallSuccess = (payload) => {
-  return payload?.result !== void 0;
-};
-var isEvmCallResult = isPayloadOfSchemaType(EvmCallResultSchema);
-var asEvmCallSuccess = (payload) => isEvmCallSuccess(payload) ? payload : void 0;
-var EvmCallDivinerConfigSchema = "network.xyo.evm.call.diviner.config";
-var EvmCallResultsSchema = "network.xyo.evm.call.results";
-var EvmCallDiviner = class _EvmCallDiviner extends AbstractDiviner {
-  static configSchemas = [...super.configSchemas, EvmCallDivinerConfigSchema];
-  static defaultConfigSchema = EvmCallDivinerConfigSchema;
-  static labels = { ...super.labels, ...EvmCallDivinerLabels };
-  static findCallResult(address, functionName, payloads) {
-    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address);
-    return asEvmCallSuccess(foundPayload)?.result;
-  }
-  static matchingExistingField(objs, field) {
-    const expectedValue = objs.at(0)?.[field];
-    const didNotMatch = objs.reduce((prev, obj) => {
-      return prev || obj[field] !== expectedValue;
-    }, false);
-    return didNotMatch ? void 0 : expectedValue;
-  }
-  contractInfoRequiredFields(callResults) {
-    return {
-      address: assertEx(_EvmCallDiviner.matchingExistingField(callResults, "address"), () => "Mismatched address"),
-      chainId: assertEx(_EvmCallDiviner.matchingExistingField(callResults, "chainId"), () => "Mismatched chainId"),
-      schema: EvmCallResultsSchema
-    };
-  }
-  async divineHandler(inPayloads = []) {
-    const callResults = inPayloads.filter(isPayloadOfSchemaType2(EvmCallResultSchema));
-    const addresses = Object.keys(
-      // eslint-disable-next-line unicorn/no-array-reduce
-      callResults.reduce((prev, result2) => {
-        if (result2.address) {
-          prev[result2.address] = true;
-        }
-        return prev;
-      }, {})
-    );
-    const result = await Promise.all(
-      addresses.map(async (address) => {
-        const foundCallResults = callResults.filter((callResult) => callResult.address === address);
-        const results = {
-          results: await this.reduceResults(foundCallResults),
-          ...this.contractInfoRequiredFields(foundCallResults)
-        };
-        return results;
-      })
-    );
-    return result;
-  }
-  reduceResults(callResults) {
-    return callResults.reduce((prev, callResult) => {
-      const typedCallResult = asEvmCallSuccess(callResult);
-      if (typedCallResult) {
-        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result };
-      }
-      return prev;
-    }, {});
-  }
-};
-var EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-var EvmCallWitness = class extends AbstractEvmWitness {
-  static configSchemas = [...super.configSchemas, EvmCallWitnessConfigSchema];
-  static defaultConfigSchema = EvmCallWitnessConfigSchema;
-  get abi() {
-    return assertEx2(this.config.abi, () => "Missing abi");
-  }
-  async observeHandler(inPayloads = []) {
-    await this.started("throw");
-    await this.getProviders();
-    try {
-      const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType3(EvmCallSchema)).map(async ({
-          functionName,
-          args,
-          address,
-          block: payloadBlock
-        }) => {
-          const validatedAddress = assertEx2(address ?? this.config.address, () => "Missing address");
-          const validatedFunctionName = assertEx2(functionName ?? this.config.functionName, () => "Missing address");
-          const mergedArgs = [...args ?? this.config.args ?? []];
-          const provider = await this.getProvider(true, true);
-          const block = this.config.block ?? payloadBlock ?? await provider.getBlockNumber();
-          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block);
-          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block);
-          const implementation = isHexZero(erc1967Status.slots.implementation ?? "0x00") ? erc1822Status.implementation : erc1967Status.implementation;
-          const contract = new Contract(implementation, this.abi, provider);
-          let transformedResult;
-          try {
-            const result = await contract[validatedFunctionName](...mergedArgs);
-            transformedResult = typeof result === "bigint" ? `0x${result.toString(16)}` : result;
-          } catch {
-          }
-          const observation = {
-            address: validatedAddress,
-            args: mergedArgs,
-            block,
-            chainId: Number((await provider.getNetwork()).chainId),
-            functionName: validatedFunctionName,
-            result: transformedResult,
-            schema: EvmCallResultSchema
-          };
-          if (implementation !== validatedAddress) {
-            observation.implementation = implementation;
-          }
-          return observation;
-        })
-      );
-      return observations;
-    } catch (ex) {
-      const error = ex;
-      console.log(`Error [${this.config.name}]: ${error.message}`);
-      throw error;
-    }
-  }
-};
-
-// src/Diviner.ts
-var EvmCallResultToNftTokenUriDiviner = class extends AbstractDiviner2 {
+var EvmCallResultToNftTokenUriDiviner = class extends AbstractDiviner {
   static configSchemas = [...super.configSchemas, EvmCallResultToNftTokenUriDivinerConfigSchema];
   static defaultConfigSchema = EvmCallResultToNftTokenUriDivinerConfigSchema;
   // TODO: Add support for ERC1155 with `uri` function in addition to current ERC721 `tokenURI` support
   divineHandler(payloads = []) {
-    const evmCallResults = payloads.filter(isPayloadOfSchemaType4(EvmCallResultsSchema));
+    const evmCallResults = payloads.filter(isPayloadOfSchemaType(EvmCallResultsSchema));
     const erc721CallResults = evmCallResults.filter((p) => {
       const casted = p;
       return casted.results?.tokenURI?.result !== void 0 && (p.results?.tokenURI?.args?.length ?? 0) > 0;

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts","../../../../../src/Diviner.ts","../../../../../src/Labels.ts","../../../../../src/Payload.ts","../../../../../src/model.ts","../../../../../src/Witness.ts"],"sourcesContent":["/**\n * The schema for the EVM call result to NFT token URI diviner.\n */\nexport const EvmCallResultToNftTokenUriDivinerSchema = 'network.xyo.evm.call.results.metadata.uri.diviner'\n/**\n * The schema for the EVM call result to NFT token URI diviner.\n */\nexport type EvmCallResultToNftTokenUriDivinerSchema = typeof EvmCallResultToNftTokenUriDivinerSchema\n","import type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { EvmCallResultToNftTokenUriDivinerSchema } from './Schema.ts'\n\n/**\n * The config schema for the EVM call result to NFT token URI diviner\n */\nexport const EvmCallResultToNftTokenUriDivinerConfigSchema = `${EvmCallResultToNftTokenUriDivinerSchema}.config`\n/**\n * The config schema for the EVM call result to NFT token URI diviner\n */\nexport type EvmCallResultToNftTokenUriDivinerConfigSchema = typeof EvmCallResultToNftTokenUriDivinerConfigSchema\n\n/**\n * The config for the EVM call result to NFT token URI diviner\n */\nexport type EvmCallResultToNftTokenUriDivinerConfig = DivinerConfig<{ schema: EvmCallResultToNftTokenUriDivinerConfigSchema }>\n","import { AbstractDiviner } from '@xyo-network/diviner-abstract'\n// eslint-disable-next-line workspaces/no-absolute-imports\nimport type { EvmCallResults } from '@xyo-network/evm-call-witness'\nimport type { NftMetadataUri } from '@xyo-network/evm-nft-id-payload-plugin'\nimport { NftMetadataUriSchema } from '@xyo-network/evm-nft-id-payload-plugin'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nimport { EvmCallResultsSchema } from '../../../..'\nimport { EvmCallResultToNftTokenUriDivinerConfigSchema } from './Config.ts'\nimport type { EvmCallResultToNftTokenUriDivinerParams } from './Params.ts'\nimport type { EvmTokenUriCallResults } from './Payload.ts'\n\nexport class EvmCallResultToNftTokenUriDiviner<\n  TParams extends EvmCallResultToNftTokenUriDivinerParams = EvmCallResultToNftTokenUriDivinerParams,\n> extends AbstractDiviner<TParams, Payload, NftMetadataUri> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallResultToNftTokenUriDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallResultToNftTokenUriDivinerConfigSchema\n\n  // TODO: Add support for ERC1155 with `uri` function in addition to current ERC721 `tokenURI` support\n  protected override divineHandler(payloads: Payload[] = []): NftMetadataUri[] {\n    const evmCallResults = payloads.filter(isPayloadOfSchemaType<EvmCallResults>(EvmCallResultsSchema))\n    const erc721CallResults = evmCallResults\n      .filter((p): p is EvmTokenUriCallResults => {\n        const casted = p as EvmTokenUriCallResults\n        return casted.results?.tokenURI?.result !== undefined && (p.results?.tokenURI?.args?.length ?? 0) > 0\n      })\n      .map<NftMetadataUri>((p) => {\n        const {\n          address, chainId, results,\n        } = p\n        const { args, result } = results.tokenURI\n        const tokenId = args[0]\n        const num = Number(BigInt(tokenId)).toString()\n        const metadataUri = result?.includes('{id}') ? result.replace('{id}', num) : result\n        return {\n          address, chainId, metadataUri, schema: NftMetadataUriSchema, tokenId,\n        }\n      })\n    return erc721CallResults\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels.ts'\nimport type { EvmCallResult } from './Payload.ts'\nimport { asEvmCallSuccess, EvmCallResultSchema } from './Payload.ts'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: number\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallDivinerConfigSchema\n  static override readonly labels: EvmCallDivinerLabels = { ...super.labels, ...EvmCallDivinerLabels }\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find(payload => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(foundPayload)?.result as TResult | undefined\n  }\n\n  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {\n    const expectedValue = objs.at(0)?.[field] as R\n    // eslint-disable-next-line unicorn/no-array-reduce\n    const didNotMatch = objs.reduce((prev, obj) => {\n      return prev || obj[field] !== expectedValue\n    }, false)\n    return didNotMatch ? undefined : expectedValue\n  }\n\n  protected contractInfoRequiredFields(callResults: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), () => 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), () => 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\n      callResults.reduce<Record<string, boolean>>((prev, result) => {\n        if (result.address) {\n          prev[result.address] = true\n        }\n        return prev\n      }, {}),\n    )\n    const result = await Promise.all(\n      addresses.map(async (address) => {\n        const foundCallResults = callResults.filter(callResult => callResult.address === address)\n        const results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import type { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = { 'network.xyo.crypto.contract.info': 'diviner' }\n","import type { Payload } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport type { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport type { JsonObject } from '@xylabs/object'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport type { Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport type { InterfaceAbi } from 'ethers'\nimport { Contract } from 'ethers'\n\nimport type { EvmCallWitnessParams } from './model.ts'\nimport { EvmCallWitnessConfigSchema } from './model.ts'\nimport type {\n  EvmCall, EvmCallResult,\n  EvmCallSuccess,\n} from './Payload.ts'\nimport { EvmCallResultSchema, EvmCallSchema } from './Payload.ts'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallWitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallWitnessConfigSchema\n\n  get abi() {\n    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    // calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({\n          functionName, args, address, block: payloadBlock,\n        }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address')\n          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, () => 'Missing address')\n          const mergedArgs = [...(args ?? this.config.args ?? [])] as JsonObject[]\n\n          const provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          // Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          // Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            // const error = ex as Error & { code: string }\n            // this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          // console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n}\n"],"mappings":"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","names":["AbstractDiviner","isPayloadOfSchemaType","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType","result","assertEx","AbstractDiviner","isPayloadOfSchemaType"]}
+{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["/**\n * The schema for the EVM call result to NFT token URI diviner.\n */\nexport const EvmCallResultToNftTokenUriDivinerSchema = 'network.xyo.evm.call.results.metadata.uri.diviner'\n/**\n * The schema for the EVM call result to NFT token URI diviner.\n */\nexport type EvmCallResultToNftTokenUriDivinerSchema = typeof EvmCallResultToNftTokenUriDivinerSchema\n","import type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { EvmCallResultToNftTokenUriDivinerSchema } from './Schema.ts'\n\n/**\n * The config schema for the EVM call result to NFT token URI diviner\n */\nexport const EvmCallResultToNftTokenUriDivinerConfigSchema = `${EvmCallResultToNftTokenUriDivinerSchema}.config`\n/**\n * The config schema for the EVM call result to NFT token URI diviner\n */\nexport type EvmCallResultToNftTokenUriDivinerConfigSchema = typeof EvmCallResultToNftTokenUriDivinerConfigSchema\n\n/**\n * The config for the EVM call result to NFT token URI diviner\n */\nexport type EvmCallResultToNftTokenUriDivinerConfig = DivinerConfig<{ schema: EvmCallResultToNftTokenUriDivinerConfigSchema }>\n","import { AbstractDiviner } from '@xyo-network/diviner-abstract'\n// eslint-disable-next-line workspaces/no-absolute-imports\nimport { EvmCallResultsSchema, type EvmCallResults } from '@xyo-network/evm-call-witness'\nimport type { NftMetadataUri } from '@xyo-network/evm-nft-id-payload-plugin'\nimport { NftMetadataUriSchema } from '@xyo-network/evm-nft-id-payload-plugin'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nimport { EvmCallResultToNftTokenUriDivinerConfigSchema } from './Config.ts'\nimport type { EvmCallResultToNftTokenUriDivinerParams } from './Params.ts'\nimport type { EvmTokenUriCallResults } from './Payload.ts'\n\nexport class EvmCallResultToNftTokenUriDiviner<\n  TParams extends EvmCallResultToNftTokenUriDivinerParams = EvmCallResultToNftTokenUriDivinerParams,\n> extends AbstractDiviner<TParams, Payload, NftMetadataUri> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallResultToNftTokenUriDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallResultToNftTokenUriDivinerConfigSchema\n\n  // TODO: Add support for ERC1155 with `uri` function in addition to current ERC721 `tokenURI` support\n  protected override divineHandler(payloads: Payload[] = []): NftMetadataUri[] {\n    const evmCallResults = payloads.filter(isPayloadOfSchemaType<EvmCallResults>(EvmCallResultsSchema))\n    const erc721CallResults = evmCallResults\n      .filter((p): p is EvmTokenUriCallResults => {\n        const casted = p as EvmTokenUriCallResults\n        return casted.results?.tokenURI?.result !== undefined && (p.results?.tokenURI?.args?.length ?? 0) > 0\n      })\n      .map<NftMetadataUri>((p) => {\n        const {\n          address, chainId, results,\n        } = p\n        const { args, result } = results.tokenURI\n        const tokenId = args[0]\n        const num = Number(BigInt(tokenId)).toString()\n        const metadataUri = result?.includes('{id}') ? result.replace('{id}', num) : result\n        return {\n          address, chainId, metadataUri, schema: NftMetadataUriSchema, tokenId,\n        }\n      })\n    return erc721CallResults\n  }\n}\n"],"mappings":";AAGO,IAAM,0CAA0C;;;ACIhD,IAAM,gDAAgD,GAAG,uCAAuC;;;ACPvG,SAAS,uBAAuB;AAEhC,SAAS,4BAAiD;AAE1D,SAAS,4BAA4B;AAErC,SAAS,6BAA6B;AAM/B,IAAM,oCAAN,cAEG,gBAAkD;AAAA,EAC1D,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,6CAA6C;AAAA,EACzH,OAAyB,sBAA8B;AAAA;AAAA,EAGpC,cAAc,WAAsB,CAAC,GAAqB;AAC3E,UAAM,iBAAiB,SAAS,OAAO,sBAAsC,oBAAoB,CAAC;AAClG,UAAM,oBAAoB,eACvB,OAAO,CAAC,MAAmC;AAC1C,YAAM,SAAS;AACf,aAAO,OAAO,SAAS,UAAU,WAAW,WAAc,EAAE,SAAS,UAAU,MAAM,UAAU,KAAK;AAAA,IACtG,CAAC,EACA,IAAoB,CAAC,MAAM;AAC1B,YAAM;AAAA,QACJ;AAAA,QAAS;AAAA,QAAS;AAAA,MACpB,IAAI;AACJ,YAAM,EAAE,MAAM,OAAO,IAAI,QAAQ;AACjC,YAAM,UAAU,KAAK,CAAC;AACtB,YAAM,MAAM,OAAO,OAAO,OAAO,CAAC,EAAE,SAAS;AAC7C,YAAM,cAAc,QAAQ,SAAS,MAAM,IAAI,OAAO,QAAQ,QAAQ,GAAG,IAAI;AAC7E,aAAO;AAAA,QACL;AAAA,QAAS;AAAA,QAAS;AAAA,QAAa,QAAQ;AAAA,QAAsB;AAAA,MAC/D;AAAA,IACF,CAAC;AACH,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/types/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAG/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAKjE,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,aAAa,CAAA;AAG1E,qBAAa,iCAAiC,CAC5C,OAAO,SAAS,uCAAuC,GAAG,uCAAuC,CACjG,SAAQ,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC;IACzD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA0E;IAC1H,gBAAyB,mBAAmB,EAAE,MAAM,CAAgD;cAGjF,aAAa,CAAC,QAAQ,GAAE,OAAO,EAAO,GAAG,cAAc,EAAE;CAqB7E"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAG/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAIjE,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,aAAa,CAAA;AAG1E,qBAAa,iCAAiC,CAC5C,OAAO,SAAS,uCAAuC,GAAG,uCAAuC,CACjG,SAAQ,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC;IACzD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA0E;IAC1H,gBAAyB,mBAAmB,EAAE,MAAM,CAAgD;cAGjF,aAAa,CAAC,QAAQ,GAAE,OAAO,EAAO,GAAG,cAAc,EAAE;CAqB7E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-evm-call-result-to-token-uri",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,21 +29,21 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/types/index.d.ts",
   "dependencies": {
-    "@xyo-network/diviner-abstract": "^3.9.36",
-    "@xyo-network/diviner-model": "^3.9.36",
-    "@xyo-network/evm-call-witness": "^3.4.4",
-    "@xyo-network/evm-nft-id-payload-plugin": "^3.4.4",
-    "@xyo-network/module-model": "^3.9.36",
-    "@xyo-network/payload-model": "^3.9.36",
-    "ethers": "^6.13.5"
+    "@xyo-network/diviner-abstract": "^3.10.6",
+    "@xyo-network/diviner-model": "^3.10.6",
+    "@xyo-network/evm-call-witness": "^3.4.6",
+    "@xyo-network/evm-nft-id-payload-plugin": "^3.4.6",
+    "@xyo-network/module-model": "^3.10.6",
+    "@xyo-network/payload-model": "^3.10.6",
+    "ethers": "^6.13.6"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^6.0.5",
-    "@xylabs/tsconfig": "^6.0.5",
-    "@xylabs/vitest-extended": "^4.6.0",
-    "@xyo-network/evm-nft-id-payload-plugin": "^3.4.4",
+    "@xylabs/ts-scripts-yarn3": "^6.2.1",
+    "@xylabs/tsconfig": "^6.2.1",
+    "@xylabs/vitest-extended": "^4.7.15",
+    "@xyo-network/evm-nft-id-payload-plugin": "^3.4.6",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.8"
+    "vitest": "^3.1.1"
   },
   "publishConfig": {
     "access": "public"

package/src/Diviner.ts

@@ -1,12 +1,11 @@
 import { AbstractDiviner } from '@xyo-network/diviner-abstract'
 // eslint-disable-next-line workspaces/no-absolute-imports
-import type { EvmCallResults } from '@xyo-network/evm-call-witness'
+import { EvmCallResultsSchema, type EvmCallResults } from '@xyo-network/evm-call-witness'
 import type { NftMetadataUri } from '@xyo-network/evm-nft-id-payload-plugin'
 import { NftMetadataUriSchema } from '@xyo-network/evm-nft-id-payload-plugin'
 import type { Payload, Schema } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 
-import { EvmCallResultsSchema } from '../../../..'
 import { EvmCallResultToNftTokenUriDivinerConfigSchema } from './Config.ts'
 import type { EvmCallResultToNftTokenUriDivinerParams } from './Params.ts'
 import type { EvmTokenUriCallResults } from './Payload.ts'