dop-wallet-v6 1.1.5 → 1.1.7

package/README.md

@@ -1,2 +0,0 @@
-# dop-wallet
-`npm install --legacy-peer-deps`

package/dist/services/artifacts/artifact-downloader.d.ts

@@ -1,4 +1,4 @@
-import { Artifact } from 'dop-sharedmodel-v5';
+import { Artifact } from 'dop-sharedmodel';
 import { ArtifactStore } from './artifact-store';
 export declare class ArtifactDownloader {
     private artifactStore;

package/dist/services/artifacts/artifact-downloader.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArtifactDownloader = void 0;
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const axios_1 = __importDefault(require("axios"));
 const artifact_util_1 = require("./artifact-util");
 const error_1 = require("../../utils/error");
@@ -14,18 +14,18 @@ class ArtifactDownloader {
     constructor(artifactStore, useNativeArtifacts) {
         this.downloadArtifacts = async (artifactVariantString) => {
             (0, logger_1.sendMessage)(`Downloading artifacts: ${artifactVariantString}`);
-            const [vkeyPath, zkeyPath, wasmOrDatPath] = await (0, dop_sharedmodel_v5_1.promiseTimeout)(Promise.all([
-                this.downloadArtifact(dop_sharedmodel_v5_1.ArtifactName.VKEY, artifactVariantString),
-                this.downloadArtifact(dop_sharedmodel_v5_1.ArtifactName.ZKEY, artifactVariantString),
-                this.downloadArtifact(this.useNativeArtifacts ? dop_sharedmodel_v5_1.ArtifactName.DAT : dop_sharedmodel_v5_1.ArtifactName.WASM, artifactVariantString),
+            const [vkeyPath, zkeyPath, wasmOrDatPath] = await (0, dop_sharedmodel_1.promiseTimeout)(Promise.all([
+                this.downloadArtifact(dop_sharedmodel_1.ArtifactName.VKEY, artifactVariantString),
+                this.downloadArtifact(dop_sharedmodel_1.ArtifactName.ZKEY, artifactVariantString),
+                this.downloadArtifact(this.useNativeArtifacts ? dop_sharedmodel_1.ArtifactName.DAT : dop_sharedmodel_1.ArtifactName.WASM, artifactVariantString),
             ]), 45000, new Error(`Timed out downloading artifact files for ${artifactVariantString} circuit. Please try again.`));
-            if (!(0, dop_sharedmodel_v5_1.isDefined)(vkeyPath)) {
+            if (!(0, dop_sharedmodel_1.isDefined)(vkeyPath)) {
                 throw new Error('Could not download vkey artifact.');
             }
-            if (!(0, dop_sharedmodel_v5_1.isDefined)(zkeyPath)) {
+            if (!(0, dop_sharedmodel_1.isDefined)(zkeyPath)) {
                 throw new Error('Could not download zkey artifact.');
             }
-            if (!(0, dop_sharedmodel_v5_1.isDefined)(wasmOrDatPath)) {
+            if (!(0, dop_sharedmodel_1.isDefined)(wasmOrDatPath)) {
                 throw new Error(this.useNativeArtifacts
                     ? 'Could not download dat artifact.'
                     : 'Could not download wasm artifact.');
@@ -75,13 +75,13 @@ class ArtifactDownloader {
         this.getDownloadedArtifacts = async (artifactVariantString) => {
             const artifactDownloadsPaths = (0, artifact_util_1.getArtifactDownloadsPaths)(artifactVariantString);
             const [vkeyString, zkeyBuffer, datBuffer, wasmBuffer] = await Promise.all([
-                this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_v5_1.ArtifactName.VKEY]),
-                this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_v5_1.ArtifactName.ZKEY]),
+                this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_1.ArtifactName.VKEY]),
+                this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_1.ArtifactName.ZKEY]),
                 this.useNativeArtifacts
-                    ? this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_v5_1.ArtifactName.DAT])
+                    ? this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_1.ArtifactName.DAT])
                     : Promise.resolve(undefined),
                 !this.useNativeArtifacts
-                    ? this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_v5_1.ArtifactName.WASM])
+                    ? this.getDownloadedArtifact(artifactDownloadsPaths[dop_sharedmodel_1.ArtifactName.WASM])
                     : Promise.resolve(undefined),
             ]);
             if (vkeyString == null) {
@@ -110,21 +110,21 @@ class ArtifactDownloader {
 exports.ArtifactDownloader = ArtifactDownloader;
 ArtifactDownloader.getArtifactData = (data, artifactName) => {
     switch (artifactName) {
-        case dop_sharedmodel_v5_1.ArtifactName.VKEY:
+        case dop_sharedmodel_1.ArtifactName.VKEY:
             return data;
-        case dop_sharedmodel_v5_1.ArtifactName.ZKEY:
-        case dop_sharedmodel_v5_1.ArtifactName.DAT:
-        case dop_sharedmodel_v5_1.ArtifactName.WASM:
+        case dop_sharedmodel_1.ArtifactName.ZKEY:
+        case dop_sharedmodel_1.ArtifactName.DAT:
+        case dop_sharedmodel_1.ArtifactName.WASM:
             return (0, artifact_util_1.decompressArtifact)(data);
     }
 };
 ArtifactDownloader.artifactResponseType = (artifactName) => {
     switch (artifactName) {
-        case dop_sharedmodel_v5_1.ArtifactName.VKEY:
+        case dop_sharedmodel_1.ArtifactName.VKEY:
             return 'text';
-        case dop_sharedmodel_v5_1.ArtifactName.ZKEY:
-        case dop_sharedmodel_v5_1.ArtifactName.DAT:
-        case dop_sharedmodel_v5_1.ArtifactName.WASM:
+        case dop_sharedmodel_1.ArtifactName.ZKEY:
+        case dop_sharedmodel_1.ArtifactName.DAT:
+        case dop_sharedmodel_1.ArtifactName.WASM:
             return 'arraybuffer';
     }
 };

package/dist/services/artifacts/artifact-downloader.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-downloader.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-downloader.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Artifact,\n  ArtifactName,\n  isDefined,\n  promiseTimeout,\n} from 'dop-sharedmodel-v5';\nimport axios, { ResponseType } from 'axios';\nimport {\n  artifactDownloadsDir,\n  artifactDownloadsPath,\n  decompressArtifact,\n  getArtifactDownloadsPaths,\n  getArtifactUrl,\n} from './artifact-util';\nimport { ArtifactStore } from './artifact-store';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { sendMessage } from '../../utils/logger';\nimport { validateArtifactDownload } from './artifact-hash';\n\nexport class ArtifactDownloader {\n  private artifactStore: ArtifactStore;\n  private useNativeArtifacts: boolean;\n\n  constructor(artifactStore: ArtifactStore, useNativeArtifacts: boolean) {\n    this.artifactStore = artifactStore;\n    this.useNativeArtifacts = useNativeArtifacts;\n  }\n\n  downloadArtifacts = async (artifactVariantString: string): Promise<void> => {\n    sendMessage(`Downloading artifacts: ${artifactVariantString}`);\n\n    const [vkeyPath, zkeyPath, wasmOrDatPath] = await promiseTimeout(\n      Promise.all([\n        this.downloadArtifact(ArtifactName.VKEY, artifactVariantString),\n        this.downloadArtifact(ArtifactName.ZKEY, artifactVariantString),\n        this.downloadArtifact(\n          this.useNativeArtifacts ? ArtifactName.DAT : ArtifactName.WASM,\n          artifactVariantString,\n        ),\n      ]),\n      45000,\n      new Error(\n        `Timed out downloading artifact files for ${artifactVariantString} circuit. Please try again.`,\n      ),\n    );\n\n    if (!isDefined(vkeyPath)) {\n      throw new Error('Could not download vkey artifact.');\n    }\n    if (!isDefined(zkeyPath)) {\n      throw new Error('Could not download zkey artifact.');\n    }\n    if (!isDefined(wasmOrDatPath)) {\n      throw new Error(\n        this.useNativeArtifacts\n          ? 'Could not download dat artifact.'\n          : 'Could not download wasm artifact.',\n      );\n    }\n  };\n\n  private downloadArtifact = async (\n    artifactName: ArtifactName,\n    artifactVariantString: string,\n  ): Promise<string | undefined> => {\n    const path = artifactDownloadsPath(artifactName, artifactVariantString);\n    if (await this.artifactStore.exists(path)) {\n      return path;\n    }\n    try {\n      const url = getArtifactUrl(artifactName, artifactVariantString);\n\n      const result = await axios.get(url, {\n        method: 'GET',\n        responseType: ArtifactDownloader.artifactResponseType(artifactName),\n      });\n      const data: ArrayBuffer | Buffer | object = result.data;\n\n      // NodeJS downloads as Buffer.\n      // Browser downloads as ArrayBuffer.\n      // Both will validate with the same hash.\n      const dataFormatted: ArrayBuffer | Buffer | string =\n        data instanceof ArrayBuffer || data instanceof Buffer\n          ? data\n          : JSON.stringify(data);\n\n      const decompressedData = ArtifactDownloader.getArtifactData(\n        dataFormatted,\n        artifactName,\n      );\n\n      const isValid = await validateArtifactDownload(\n        decompressedData,\n        artifactName,\n        artifactVariantString,\n      );\n      if (isValid) {\n        await this.artifactStore.store(\n          artifactDownloadsDir(artifactVariantString),\n          path,\n          decompressedData,\n        );\n      } else {\n        throw new Error(\n          `Invalid hash for artifact download: ${artifactName} for ${artifactVariantString}.`,\n        );\n      }\n\n      return path;\n    } catch (err) {\n      throw reportAndSanitizeError(this.downloadArtifact.name, err);\n    }\n  };\n\n  private static getArtifactData = (\n    data: string | ArrayBuffer,\n    artifactName: ArtifactName,\n  ): string | Uint8Array => {\n    switch (artifactName) {\n      case ArtifactName.VKEY:\n        return data as string;\n      case ArtifactName.ZKEY:\n      case ArtifactName.DAT:\n      case ArtifactName.WASM:\n        return decompressArtifact(data as ArrayBuffer);\n    }\n  };\n\n  private static artifactResponseType = (\n    artifactName: ArtifactName,\n  ): ResponseType => {\n    switch (artifactName) {\n      case ArtifactName.VKEY:\n        return 'text';\n      case ArtifactName.ZKEY:\n      case ArtifactName.DAT:\n      case ArtifactName.WASM:\n        return 'arraybuffer';\n    }\n  };\n\n  private getDownloadedArtifact = async (\n    path: string,\n  ): Promise<string | Buffer | null> => {\n    try {\n      const storedItem = await this.artifactStore.get(path);\n      return storedItem;\n    } catch (err) {\n      return null;\n    }\n  };\n\n  getDownloadedArtifacts = async (\n    artifactVariantString: string,\n  ): Promise<Artifact> => {\n    const artifactDownloadsPaths = getArtifactDownloadsPaths(\n      artifactVariantString,\n    );\n\n    const [vkeyString, zkeyBuffer, datBuffer, wasmBuffer] = await Promise.all([\n      this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.VKEY]),\n      this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.ZKEY]),\n      this.useNativeArtifacts\n        ? this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.DAT])\n        : Promise.resolve(undefined),\n      !this.useNativeArtifacts\n        ? this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.WASM])\n        : Promise.resolve(undefined),\n    ]);\n    if (vkeyString == null) {\n      throw new Error('Could not retrieve vkey artifact.');\n    }\n    if (zkeyBuffer == null) {\n      throw new Error('Could not retrieve zkey artifact.');\n    }\n    if (this.useNativeArtifacts && datBuffer == null) {\n      throw new Error('Could not retrieve dat artifact.');\n    }\n    if (!this.useNativeArtifacts && wasmBuffer == null) {\n      throw new Error('Could not retrieve wasm artifact.');\n    }\n\n    return {\n      vkey: JSON.parse(vkeyString as string),\n      zkey: zkeyBuffer as Buffer,\n      wasm: wasmBuffer as Buffer | undefined,\n      dat: datBuffer as Buffer | undefined,\n    };\n  };\n}\n"]}
+{"version":3,"file":"artifact-downloader.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-downloader.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Artifact,\n  ArtifactName,\n  isDefined,\n  promiseTimeout,\n} from 'dop-sharedmodel';\nimport axios, { ResponseType } from 'axios';\nimport {\n  artifactDownloadsDir,\n  artifactDownloadsPath,\n  decompressArtifact,\n  getArtifactDownloadsPaths,\n  getArtifactUrl,\n} from './artifact-util';\nimport { ArtifactStore } from './artifact-store';\nimport { reportAndSanitizeError } from '../../utils/error';\nimport { sendMessage } from '../../utils/logger';\nimport { validateArtifactDownload } from './artifact-hash';\n\nexport class ArtifactDownloader {\n  private artifactStore: ArtifactStore;\n  private useNativeArtifacts: boolean;\n\n  constructor(artifactStore: ArtifactStore, useNativeArtifacts: boolean) {\n    this.artifactStore = artifactStore;\n    this.useNativeArtifacts = useNativeArtifacts;\n  }\n\n  downloadArtifacts = async (artifactVariantString: string): Promise<void> => {\n    sendMessage(`Downloading artifacts: ${artifactVariantString}`);\n\n    const [vkeyPath, zkeyPath, wasmOrDatPath] = await promiseTimeout(\n      Promise.all([\n        this.downloadArtifact(ArtifactName.VKEY, artifactVariantString),\n        this.downloadArtifact(ArtifactName.ZKEY, artifactVariantString),\n        this.downloadArtifact(\n          this.useNativeArtifacts ? ArtifactName.DAT : ArtifactName.WASM,\n          artifactVariantString,\n        ),\n      ]),\n      45000,\n      new Error(\n        `Timed out downloading artifact files for ${artifactVariantString} circuit. Please try again.`,\n      ),\n    );\n\n    if (!isDefined(vkeyPath)) {\n      throw new Error('Could not download vkey artifact.');\n    }\n    if (!isDefined(zkeyPath)) {\n      throw new Error('Could not download zkey artifact.');\n    }\n    if (!isDefined(wasmOrDatPath)) {\n      throw new Error(\n        this.useNativeArtifacts\n          ? 'Could not download dat artifact.'\n          : 'Could not download wasm artifact.',\n      );\n    }\n  };\n\n  private downloadArtifact = async (\n    artifactName: ArtifactName,\n    artifactVariantString: string,\n  ): Promise<string | undefined> => {\n    const path = artifactDownloadsPath(artifactName, artifactVariantString);\n    if (await this.artifactStore.exists(path)) {\n      return path;\n    }\n    try {\n      const url = getArtifactUrl(artifactName, artifactVariantString);\n\n      const result = await axios.get(url, {\n        method: 'GET',\n        responseType: ArtifactDownloader.artifactResponseType(artifactName),\n      });\n      const data: ArrayBuffer | Buffer | object = result.data;\n\n      // NodeJS downloads as Buffer.\n      // Browser downloads as ArrayBuffer.\n      // Both will validate with the same hash.\n      const dataFormatted: ArrayBuffer | Buffer | string =\n        data instanceof ArrayBuffer || data instanceof Buffer\n          ? data\n          : JSON.stringify(data);\n\n      const decompressedData = ArtifactDownloader.getArtifactData(\n        dataFormatted,\n        artifactName,\n      );\n\n      const isValid = await validateArtifactDownload(\n        decompressedData,\n        artifactName,\n        artifactVariantString,\n      );\n      if (isValid) {\n        await this.artifactStore.store(\n          artifactDownloadsDir(artifactVariantString),\n          path,\n          decompressedData,\n        );\n      } else {\n        throw new Error(\n          `Invalid hash for artifact download: ${artifactName} for ${artifactVariantString}.`,\n        );\n      }\n\n      return path;\n    } catch (err) {\n      throw reportAndSanitizeError(this.downloadArtifact.name, err);\n    }\n  };\n\n  private static getArtifactData = (\n    data: string | ArrayBuffer,\n    artifactName: ArtifactName,\n  ): string | Uint8Array => {\n    switch (artifactName) {\n      case ArtifactName.VKEY:\n        return data as string;\n      case ArtifactName.ZKEY:\n      case ArtifactName.DAT:\n      case ArtifactName.WASM:\n        return decompressArtifact(data as ArrayBuffer);\n    }\n  };\n\n  private static artifactResponseType = (\n    artifactName: ArtifactName,\n  ): ResponseType => {\n    switch (artifactName) {\n      case ArtifactName.VKEY:\n        return 'text';\n      case ArtifactName.ZKEY:\n      case ArtifactName.DAT:\n      case ArtifactName.WASM:\n        return 'arraybuffer';\n    }\n  };\n\n  private getDownloadedArtifact = async (\n    path: string,\n  ): Promise<string | Buffer | null> => {\n    try {\n      const storedItem = await this.artifactStore.get(path);\n      return storedItem;\n    } catch (err) {\n      return null;\n    }\n  };\n\n  getDownloadedArtifacts = async (\n    artifactVariantString: string,\n  ): Promise<Artifact> => {\n    const artifactDownloadsPaths = getArtifactDownloadsPaths(\n      artifactVariantString,\n    );\n\n    const [vkeyString, zkeyBuffer, datBuffer, wasmBuffer] = await Promise.all([\n      this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.VKEY]),\n      this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.ZKEY]),\n      this.useNativeArtifacts\n        ? this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.DAT])\n        : Promise.resolve(undefined),\n      !this.useNativeArtifacts\n        ? this.getDownloadedArtifact(artifactDownloadsPaths[ArtifactName.WASM])\n        : Promise.resolve(undefined),\n    ]);\n    if (vkeyString == null) {\n      throw new Error('Could not retrieve vkey artifact.');\n    }\n    if (zkeyBuffer == null) {\n      throw new Error('Could not retrieve zkey artifact.');\n    }\n    if (this.useNativeArtifacts && datBuffer == null) {\n      throw new Error('Could not retrieve dat artifact.');\n    }\n    if (!this.useNativeArtifacts && wasmBuffer == null) {\n      throw new Error('Could not retrieve wasm artifact.');\n    }\n\n    return {\n      vkey: JSON.parse(vkeyString as string),\n      zkey: zkeyBuffer as Buffer,\n      wasm: wasmBuffer as Buffer | undefined,\n      dat: datBuffer as Buffer | undefined,\n    };\n  };\n}\n"]}

package/dist/services/artifacts/artifact-hash.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="node" />
-/// <reference types="node" />
-import { ArtifactName } from 'dop-sharedmodel-v5';
+import { ArtifactName } from 'dop-sharedmodel';
 export declare const validateArtifactDownload: (data: Uint8Array | Buffer | string, artifactName: ArtifactName, artifactVariantString: string) => Promise<boolean>;

package/dist/services/artifacts/artifact-hash.js

@@ -5,17 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateArtifactDownload = void 0;
 const crypto_1 = require("crypto");
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const sha256_js_1 = require("ethereum-cryptography/sha256.js");
 const artifact_v2_hashes_json_1 = __importDefault(require("./json/artifact-v2-hashes.json"));
-const dop_engine_v5_1 = require("dop-engine-v5");
+const dop_engine_1 = require("dop-engine");
 const getExpectedArtifactHash = (artifactName, artifactVariantString) => {
     const hashes = artifact_v2_hashes_json_1.default;
     const variantHashes = hashes[artifactVariantString];
-    if (!(0, dop_sharedmodel_v5_1.isDefined)(variantHashes)) {
+    if (!(0, dop_sharedmodel_1.isDefined)(variantHashes)) {
         throw new Error(`No hashes for variant ${artifactName}: ${artifactVariantString}`);
     }
-    if (artifactName === dop_sharedmodel_v5_1.ArtifactName.VKEY) {
+    if (artifactName === dop_sharedmodel_1.ArtifactName.VKEY) {
         throw new Error(`No artifact hashes for vkey.`);
     }
     const hash = variantHashes[artifactName];
@@ -31,15 +31,15 @@ const getDataBytes = (data) => {
     if (Buffer.isBuffer(data)) {
         return data.buffer;
     }
-    return (0, dop_engine_v5_1.hexStringToBytes)(data);
+    return (0, dop_engine_1.hexStringToBytes)(data);
 };
 const validateArtifactDownload = async (data, artifactName, artifactVariantString) => {
-    if (artifactName === dop_sharedmodel_v5_1.ArtifactName.VKEY) {
+    if (artifactName === dop_sharedmodel_1.ArtifactName.VKEY) {
         return true;
     }
     const dataBytes = getDataBytes(data);
-    const hash = dop_engine_v5_1.isReactNative
-        ? (0, dop_engine_v5_1.hexlify)((0, sha256_js_1.sha256)(dataBytes))
+    const hash = dop_engine_1.isReactNative
+        ? (0, dop_engine_1.hexlify)((0, sha256_js_1.sha256)(dataBytes))
         : (0, crypto_1.createHash)('sha256').update(dataBytes).digest('hex');
     const expectedHash = getExpectedArtifactHash(artifactName, artifactVariantString);
     // if (hash !== expectedHash) {

package/dist/services/artifacts/artifact-hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-hash.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-hash.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoC;AACpC,2DAA6D;AAC7D,+DAAyD;AAEzD,6FAAgE;AAChE,iDAIuB;AAOvB,MAAM,uBAAuB,GAAG,CAC9B,YAA0B,EAC1B,qBAA6B,EACrB,EAAE;IACV,MAAM,MAAM,GAAG,iCAAwC,CAAC;IACxD,MAAM,aAAa,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACpD,IAAI,CAAC,IAAA,8BAAS,EAAC,aAAa,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,yBAAyB,YAAY,KAAK,qBAAqB,EAAE,CAClE,CAAC;KACH;IACD,IAAI,YAAY,KAAK,iCAAY,CAAC,IAAI,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,MAAM,IAAI,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CACb,wBAAwB,YAAY,KAAK,qBAAqB,EAAE,CACjE,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAkC,EAAc,EAAE;IACtE,IAAI,IAAI,YAAY,UAAU,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC,MAAoB,CAAC;KAClC;IACD,OAAO,IAAA,gCAAgB,EAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAkC,EAClC,YAA0B,EAC1B,qBAA6B,EACX,EAAE;IACpB,IAAI,YAAY,KAAK,iCAAY,CAAC,IAAI,EAAE;QACtC,OAAO,IAAI,CAAC;KACb;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,6BAAa;QACxB,CAAC,CAAC,IAAA,uBAAO,EAAC,IAAA,kBAAM,EAAC,SAAS,CAAC,CAAC;QAC5B,CAAC,CAAC,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,uBAAuB,CAC1C,YAAY,EACZ,qBAAqB,CACtB,CAAC;IACF,+BAA+B;IAC/B,sBAAsB;IACtB,sHAAsH;IACtH,OAAO;IACP,IAAI;IACJ,gCAAgC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAvBW,QAAA,wBAAwB,4BAuBnC","sourcesContent":["import { createHash } from 'crypto';\nimport { ArtifactName, isDefined } from 'dop-sharedmodel-v5';\nimport { sha256 } from 'ethereum-cryptography/sha256.js';\nimport { sendErrorMessage } from '../../utils/logger';\nimport ARTIFACT_V2_HASHES from './json/artifact-v2-hashes.json';\nimport {\n  hexStringToBytes,\n  hexlify,\n  isReactNative,\n} from 'dop-engine-v5';\n\ntype ArtifactHashesJson = Record<\n  string,\n  Record<ArtifactName.DAT | ArtifactName.WASM | ArtifactName.ZKEY, string>\n>;\n\nconst getExpectedArtifactHash = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): string => {\n  const hashes = ARTIFACT_V2_HASHES as ArtifactHashesJson;\n  const variantHashes = hashes[artifactVariantString];\n  if (!isDefined(variantHashes)) {\n    throw new Error(\n      `No hashes for variant ${artifactName}: ${artifactVariantString}`,\n    );\n  }\n  if (artifactName === ArtifactName.VKEY) {\n    throw new Error(`No artifact hashes for vkey.`);\n  }\n  const hash = variantHashes[artifactName];\n  if (!hash) {\n    throw new Error(\n      `No hash for artifact ${artifactName}: ${artifactVariantString}`,\n    );\n  }\n  return hash;\n};\n\nconst getDataBytes = (data: Uint8Array | Buffer | string): Uint8Array => {\n  if (data instanceof Uint8Array) {\n    return data;\n  }\n  if (Buffer.isBuffer(data)) {\n    return data.buffer as Uint8Array;\n  }\n  return hexStringToBytes(data);\n};\n\nexport const validateArtifactDownload = async (\n  data: Uint8Array | Buffer | string,\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): Promise<boolean> => {\n  if (artifactName === ArtifactName.VKEY) {\n    return true;\n  }\n  const dataBytes = getDataBytes(data);\n  const hash = isReactNative\n    ? hexlify(sha256(dataBytes))\n    : createHash('sha256').update(dataBytes).digest('hex');\n  const expectedHash = getExpectedArtifactHash(\n    artifactName,\n    artifactVariantString,\n  );\n  // if (hash !== expectedHash) {\n  //   sendErrorMessage(\n  //     `Validate artifact blob for ${artifactName}: ${artifactVariantString}. Got ${hash}, expected ${expectedHash}.`,\n  //   );\n  // }\n  // return hash === expectedHash;\n  return true;\n};\n"]}
+{"version":3,"file":"artifact-hash.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-hash.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoC;AACpC,qDAA0D;AAC1D,+DAAyD;AAEzD,6FAAgE;AAChE,2CAIoB;AAOpB,MAAM,uBAAuB,GAAG,CAC9B,YAA0B,EAC1B,qBAA6B,EACrB,EAAE;IACV,MAAM,MAAM,GAAG,iCAAwC,CAAC;IACxD,MAAM,aAAa,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACpD,IAAI,CAAC,IAAA,2BAAS,EAAC,aAAa,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,yBAAyB,YAAY,KAAK,qBAAqB,EAAE,CAClE,CAAC;KACH;IACD,IAAI,YAAY,KAAK,8BAAY,CAAC,IAAI,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IACD,MAAM,IAAI,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CACb,wBAAwB,YAAY,KAAK,qBAAqB,EAAE,CACjE,CAAC;KACH;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,IAAkC,EAAc,EAAE;IACtE,IAAI,IAAI,YAAY,UAAU,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC,MAAoB,CAAC;KAClC;IACD,OAAO,IAAA,6BAAgB,EAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAkC,EAClC,YAA0B,EAC1B,qBAA6B,EACX,EAAE;IACpB,IAAI,YAAY,KAAK,8BAAY,CAAC,IAAI,EAAE;QACtC,OAAO,IAAI,CAAC;KACb;IACD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,0BAAa;QACxB,CAAC,CAAC,IAAA,oBAAO,EAAC,IAAA,kBAAM,EAAC,SAAS,CAAC,CAAC;QAC5B,CAAC,CAAC,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,uBAAuB,CAC1C,YAAY,EACZ,qBAAqB,CACtB,CAAC;IACF,+BAA+B;IAC/B,sBAAsB;IACtB,sHAAsH;IACtH,OAAO;IACP,IAAI;IACJ,gCAAgC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAvBW,QAAA,wBAAwB,4BAuBnC","sourcesContent":["import { createHash } from 'crypto';\nimport { ArtifactName, isDefined } from 'dop-sharedmodel';\nimport { sha256 } from 'ethereum-cryptography/sha256.js';\nimport { sendErrorMessage } from '../../utils/logger';\nimport ARTIFACT_V2_HASHES from './json/artifact-v2-hashes.json';\nimport {\n  hexStringToBytes,\n  hexlify,\n  isReactNative,\n} from 'dop-engine';\n\ntype ArtifactHashesJson = Record<\n  string,\n  Record<ArtifactName.DAT | ArtifactName.WASM | ArtifactName.ZKEY, string>\n>;\n\nconst getExpectedArtifactHash = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): string => {\n  const hashes = ARTIFACT_V2_HASHES as ArtifactHashesJson;\n  const variantHashes = hashes[artifactVariantString];\n  if (!isDefined(variantHashes)) {\n    throw new Error(\n      `No hashes for variant ${artifactName}: ${artifactVariantString}`,\n    );\n  }\n  if (artifactName === ArtifactName.VKEY) {\n    throw new Error(`No artifact hashes for vkey.`);\n  }\n  const hash = variantHashes[artifactName];\n  if (!hash) {\n    throw new Error(\n      `No hash for artifact ${artifactName}: ${artifactVariantString}`,\n    );\n  }\n  return hash;\n};\n\nconst getDataBytes = (data: Uint8Array | Buffer | string): Uint8Array => {\n  if (data instanceof Uint8Array) {\n    return data;\n  }\n  if (Buffer.isBuffer(data)) {\n    return data.buffer as Uint8Array;\n  }\n  return hexStringToBytes(data);\n};\n\nexport const validateArtifactDownload = async (\n  data: Uint8Array | Buffer | string,\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): Promise<boolean> => {\n  if (artifactName === ArtifactName.VKEY) {\n    return true;\n  }\n  const dataBytes = getDataBytes(data);\n  const hash = isReactNative\n    ? hexlify(sha256(dataBytes))\n    : createHash('sha256').update(dataBytes).digest('hex');\n  const expectedHash = getExpectedArtifactHash(\n    artifactName,\n    artifactVariantString,\n  );\n  // if (hash !== expectedHash) {\n  //   sendErrorMessage(\n  //     `Validate artifact blob for ${artifactName}: ${artifactVariantString}. Got ${hash}, expected ${expectedHash}.`,\n  //   );\n  // }\n  // return hash === expectedHash;\n  return true;\n};\n"]}

package/dist/services/artifacts/artifact-store.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 type GetArtifact = (path: string) => Promise<string | Buffer | null>;
 type StoreArtifact = (dir: string, path: string, item: string | Uint8Array) => Promise<void>;
 type ArtifactExists = (path: string) => Promise<boolean>;

package/dist/services/artifacts/artifact-util.d.ts

@@ -1,4 +1,4 @@
-import { ArtifactName, ArtifactMapping } from 'dop-sharedmodel-v5';
+import { ArtifactName, ArtifactMapping } from 'dop-sharedmodel';
 export declare const artifactDownloadsDir: (artifactVariantString: string) => string;
 export declare const getArtifactVariantString: (nullifiers: number, commitments: number) => string;
 export declare const artifactDownloadsPath: (artifactName: ArtifactName, artifactVariantString: string) => string;

package/dist/services/artifacts/artifact-util.js

@@ -4,19 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArtifactUrl = exports.decompressArtifact = exports.getArtifactDownloadsPaths = exports.artifactDownloadsPath = exports.getArtifactVariantString = exports.artifactDownloadsDir = void 0;
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const decompress_1 = __importDefault(require("brotli/decompress"));
+const IPFS_GATEWAY = 'https://ipfs-lb.com';
 // const IPFS_GATEWAY = 'https://ipfs-lb.com';
-// const IPFS_GATEWAY = 'https://ipfs-lb.com';
-const IPFS_GATEWAY = 'https://purple-abstract-dingo-439.mypinata.cloud';
 // https://ipfs-lb.com/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/
 // const MASTER_IPFS_HASH_ARTIFACTS = 'QmeBrG7pii1qTqsn7rusvDiqXopHPjCT9gR4PsmW7wXqZq';
 // const MASTER_IPFS_HASH_ARTIFACTS = 'QmYsMzH1PkC8eQq8nZthZb4us6C9M2JYNjhBspUPHjpkdn';
 // const MASTER_IPFS_HASH_ARTIFACTS = 'QmNqY8bHBEHgj96GSU1eyMtyZo1z5yTaM7yjQ7F1TbKE1W';
 // const MASTER_IPFS_HASH_ARTIFACTS = 'QmX6t13wppf5pUobRpmwwnyGeSHux7ecTuoQXer376hips';
 // const MASTER_IPFS_HASH_ARTIFACTS = 'Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ';
-// const MASTER_IPFS_HASH_ARTIFACTS = 'QmNT44msrqeVj1WHFkWxi9Vg6KRoG573AVDBEsKmrSDyb5';
-const MASTER_IPFS_HASH_ARTIFACTS = 'QmPKbQmGt17uic8xJLdA4wXSAZwSM4Aeg6dgqLohWrqB2Q';
+const MASTER_IPFS_HASH_ARTIFACTS = 'QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ';
 // https://purple-abstract-dingo-439.mypinata.cloud/ipfs/Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ/
 // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/${artifactFilepath}`
 // QmRJrPzD2hUmsWr7fHLsrQAJZm5J1xwji1vE2u4VFgmQcx
@@ -25,28 +23,28 @@ const artifactDownloadsDir = (artifactVariantString) => {
 };
 exports.artifactDownloadsDir = artifactDownloadsDir;
 const getArtifactVariantString = (nullifiers, commitments) => {
-    return `${nullifiers}x0`;
+    return `${nullifiers}x${commitments}`;
 };
 exports.getArtifactVariantString = getArtifactVariantString;
 const artifactDownloadsPath = (artifactName, artifactVariantString) => {
     switch (artifactName) {
-        case dop_sharedmodel_v5_1.ArtifactName.WASM:
+        case dop_sharedmodel_1.ArtifactName.WASM:
             return `${(0, exports.artifactDownloadsDir)(artifactVariantString)}/wasm`;
-        case dop_sharedmodel_v5_1.ArtifactName.ZKEY:
+        case dop_sharedmodel_1.ArtifactName.ZKEY:
             return `${(0, exports.artifactDownloadsDir)(artifactVariantString)}/zkey`;
-        case dop_sharedmodel_v5_1.ArtifactName.VKEY:
+        case dop_sharedmodel_1.ArtifactName.VKEY:
             return `${(0, exports.artifactDownloadsDir)(artifactVariantString)}/vkey.json`;
-        case dop_sharedmodel_v5_1.ArtifactName.DAT:
+        case dop_sharedmodel_1.ArtifactName.DAT:
             return `${(0, exports.artifactDownloadsDir)(artifactVariantString)}/dat`;
     }
 };
 exports.artifactDownloadsPath = artifactDownloadsPath;
 const getArtifactDownloadsPaths = (artifactVariantString) => {
     return {
-        [dop_sharedmodel_v5_1.ArtifactName.ZKEY]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_v5_1.ArtifactName.ZKEY, artifactVariantString),
-        [dop_sharedmodel_v5_1.ArtifactName.WASM]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_v5_1.ArtifactName.WASM, artifactVariantString),
-        [dop_sharedmodel_v5_1.ArtifactName.VKEY]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_v5_1.ArtifactName.VKEY, artifactVariantString),
-        [dop_sharedmodel_v5_1.ArtifactName.DAT]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_v5_1.ArtifactName.DAT, artifactVariantString),
+        [dop_sharedmodel_1.ArtifactName.ZKEY]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_1.ArtifactName.ZKEY, artifactVariantString),
+        [dop_sharedmodel_1.ArtifactName.WASM]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_1.ArtifactName.WASM, artifactVariantString),
+        [dop_sharedmodel_1.ArtifactName.VKEY]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_1.ArtifactName.VKEY, artifactVariantString),
+        [dop_sharedmodel_1.ArtifactName.DAT]: (0, exports.artifactDownloadsPath)(dop_sharedmodel_1.ArtifactName.DAT, artifactVariantString),
     };
 };
 exports.getArtifactDownloadsPaths = getArtifactDownloadsPaths;
@@ -57,27 +55,21 @@ const decompressArtifact = (arrayBuffer) => {
 exports.decompressArtifact = decompressArtifact;
 const getArtifactIPFSFilepath = (artifactName, artifactVariantString) => {
     switch (artifactName) {
-        case dop_sharedmodel_v5_1.ArtifactName.ZKEY:
+        case dop_sharedmodel_1.ArtifactName.ZKEY:
             return `${artifactVariantString}/zkey.br`;
-        case dop_sharedmodel_v5_1.ArtifactName.WASM:
+        case dop_sharedmodel_1.ArtifactName.WASM:
             return `prover/snarkjs/${artifactVariantString}.wasm.br`;
-        case dop_sharedmodel_v5_1.ArtifactName.VKEY:
+        case dop_sharedmodel_1.ArtifactName.VKEY:
             return `${artifactVariantString}/vkey.json`;
-        case dop_sharedmodel_v5_1.ArtifactName.DAT:
+        case dop_sharedmodel_1.ArtifactName.DAT:
             return `prover/native/${artifactVariantString}.dat.br`;
     }
     throw new Error('Invalid artifact.');
 };
 const getArtifactUrl = (artifactName, artifactVariantString) => {
     const artifactFilepath = getArtifactIPFSFilepath(artifactName, artifactVariantString);
-    return `${IPFS_GATEWAY}/ipfs/${MASTER_IPFS_HASH_ARTIFACTS}/${artifactFilepath}`;
-    // Qma1ATexs5LxAyjN52FFFxGwxgp5swB9GAt54kyCt39Xgk
-    // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmNT44msrqeVj1WHFkWxi9Vg6KRoG573AVDBEsKmrSDyb5/${artifactFilepath}`
-    //  https://gateway.pinata.cloud/ipfs/QmVrZ9TtZt4ZNuV4RgDqt7M7ZrsZnDUEp8QzwjLLXCp6ye/
-    // return `https://gateway.pinata.cloud/ipfs/QmVrZ9TtZt4ZNuV4RgDqt7M7ZrsZnDUEp8QzwjLLXCp6ye/${artifactFilepath}`
-    // return `https://ipfs.tizzew.com/ipfs/Qma11AJv58vSBSzE3fhUYEVxfJZCAjkD1ixLtMsGFgPUXp/${artifactFilepath}`
-    // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmeL38q7wK7W1nDajhS5zkZdqyrJ5HmiR477E3yrn6S8DJ/${artifactFilepath}`
-    // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/Qma1ATexs5LxAyjN52FFFxGwxgp5swB9GAt54kyCt39Xgk/${artifactFilepath}`
+    // return `${IPFS_GATEWAY}/ipfs/${MASTER_IPFS_HASH_ARTIFACTS}/${artifactFilepath}`;
+    return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/${artifactFilepath}`;
 };
 exports.getArtifactUrl = getArtifactUrl;
 //# sourceMappingURL=artifact-util.js.map

package/dist/services/artifacts/artifact-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifact-util.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ArtifactName,\n  ArtifactMapping,\n} from 'dop-sharedmodel-v5';\nimport brotliDecompress from 'brotli/decompress';\n\n// const IPFS_GATEWAY = 'https://ipfs-lb.com';\n// const IPFS_GATEWAY = 'https://ipfs-lb.com';\nconst IPFS_GATEWAY = 'https://purple-abstract-dingo-439.mypinata.cloud';\n\n// https://ipfs-lb.com/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/\n\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmeBrG7pii1qTqsn7rusvDiqXopHPjCT9gR4PsmW7wXqZq';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmYsMzH1PkC8eQq8nZthZb4us6C9M2JYNjhBspUPHjpkdn';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmNqY8bHBEHgj96GSU1eyMtyZo1z5yTaM7yjQ7F1TbKE1W';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmX6t13wppf5pUobRpmwwnyGeSHux7ecTuoQXer376hips';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmNT44msrqeVj1WHFkWxi9Vg6KRoG573AVDBEsKmrSDyb5';\nconst MASTER_IPFS_HASH_ARTIFACTS = 'QmPKbQmGt17uic8xJLdA4wXSAZwSM4Aeg6dgqLohWrqB2Q';\n\n// https://purple-abstract-dingo-439.mypinata.cloud/ipfs/Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ/\n// return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/${artifactFilepath}`\n\n// QmRJrPzD2hUmsWr7fHLsrQAJZm5J1xwji1vE2u4VFgmQcx\n\nexport const artifactDownloadsDir = (artifactVariantString: string) => {\n  return `artifacts-v2.1/${artifactVariantString}`;\n};\n\nexport const getArtifactVariantString = (\n  nullifiers: number,\n  commitments: number,\n) => {\n  return `${nullifiers}x0`;\n};\n\nexport const artifactDownloadsPath = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): string => {\n  switch (artifactName) {\n    case ArtifactName.WASM:\n      return `${artifactDownloadsDir(artifactVariantString)}/wasm`;\n    case ArtifactName.ZKEY:\n      return `${artifactDownloadsDir(artifactVariantString)}/zkey`;\n    case ArtifactName.VKEY:\n      return `${artifactDownloadsDir(artifactVariantString)}/vkey.json`;\n    case ArtifactName.DAT:\n      return `${artifactDownloadsDir(artifactVariantString)}/dat`;\n  }\n};\n\nexport const getArtifactDownloadsPaths = (\n  artifactVariantString: string,\n): ArtifactMapping => {\n  return {\n    [ArtifactName.ZKEY]: artifactDownloadsPath(\n      ArtifactName.ZKEY,\n      artifactVariantString,\n    ),\n    [ArtifactName.WASM]: artifactDownloadsPath(\n      ArtifactName.WASM,\n      artifactVariantString,\n    ),\n    [ArtifactName.VKEY]: artifactDownloadsPath(\n      ArtifactName.VKEY,\n      artifactVariantString,\n    ),\n    [ArtifactName.DAT]: artifactDownloadsPath(\n      ArtifactName.DAT,\n      artifactVariantString,\n    ),\n  };\n};\n\nexport const decompressArtifact = (arrayBuffer: ArrayBuffer): Uint8Array => {\n  const decompress = brotliDecompress as (input: Uint8Array) => Uint8Array;\n  return decompress(Buffer.from(arrayBuffer));\n};\n\nconst getArtifactIPFSFilepath = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n) => {\n  switch (artifactName) {\n    case ArtifactName.ZKEY:\n      return `${artifactVariantString}/zkey.br`;\n    case ArtifactName.WASM:\n      return `prover/snarkjs/${artifactVariantString}.wasm.br`;\n    case ArtifactName.VKEY:\n      return `${artifactVariantString}/vkey.json`;\n    case ArtifactName.DAT:\n      return `prover/native/${artifactVariantString}.dat.br`;\n  }\n  throw new Error('Invalid artifact.');\n};\n\nexport const getArtifactUrl = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n) => {\n  const artifactFilepath = getArtifactIPFSFilepath(\n    artifactName,\n    artifactVariantString,\n  );\n  return `${IPFS_GATEWAY}/ipfs/${MASTER_IPFS_HASH_ARTIFACTS}/${artifactFilepath}`;\n  // Qma1ATexs5LxAyjN52FFFxGwxgp5swB9GAt54kyCt39Xgk\n  // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmNT44msrqeVj1WHFkWxi9Vg6KRoG573AVDBEsKmrSDyb5/${artifactFilepath}`\n  //  https://gateway.pinata.cloud/ipfs/QmVrZ9TtZt4ZNuV4RgDqt7M7ZrsZnDUEp8QzwjLLXCp6ye/\n  // return `https://gateway.pinata.cloud/ipfs/QmVrZ9TtZt4ZNuV4RgDqt7M7ZrsZnDUEp8QzwjLLXCp6ye/${artifactFilepath}`\n  // return `https://ipfs.tizzew.com/ipfs/Qma11AJv58vSBSzE3fhUYEVxfJZCAjkD1ixLtMsGFgPUXp/${artifactFilepath}`\n  // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmeL38q7wK7W1nDajhS5zkZdqyrJ5HmiR477E3yrn6S8DJ/${artifactFilepath}`\n\n  \n  // return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/Qma1ATexs5LxAyjN52FFFxGwxgp5swB9GAt54kyCt39Xgk/${artifactFilepath}`\n};\n"]}
+{"version":3,"file":"artifact-util.js","sourceRoot":"","sources":["../../../src/services/artifacts/artifact-util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ArtifactName,\n  ArtifactMapping,\n} from 'dop-sharedmodel';\nimport brotliDecompress from 'brotli/decompress';\n\nconst IPFS_GATEWAY = 'https://ipfs-lb.com';\n// const IPFS_GATEWAY = 'https://ipfs-lb.com';\n\n// https://ipfs-lb.com/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/\n\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmeBrG7pii1qTqsn7rusvDiqXopHPjCT9gR4PsmW7wXqZq';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmYsMzH1PkC8eQq8nZthZb4us6C9M2JYNjhBspUPHjpkdn';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmNqY8bHBEHgj96GSU1eyMtyZo1z5yTaM7yjQ7F1TbKE1W';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'QmX6t13wppf5pUobRpmwwnyGeSHux7ecTuoQXer376hips';\n// const MASTER_IPFS_HASH_ARTIFACTS = 'Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ';\nconst MASTER_IPFS_HASH_ARTIFACTS = 'QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ';\n\n\n// https://purple-abstract-dingo-439.mypinata.cloud/ipfs/Qmba1JgVSQDZKUWUi6DUs9ekqo2Ta1hN3moxC2Na1eAJyJ/\n// return `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/${artifactFilepath}`\n\n// QmRJrPzD2hUmsWr7fHLsrQAJZm5J1xwji1vE2u4VFgmQcx\n\nexport const artifactDownloadsDir = (artifactVariantString: string) => {\n  return `artifacts-v2.1/${artifactVariantString}`;\n};\n\nexport const getArtifactVariantString = (\n  nullifiers: number,\n  commitments: number,\n) => {\n  return `${nullifiers}x${commitments}`;\n};\n\nexport const artifactDownloadsPath = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n): string => {\n  switch (artifactName) {\n    case ArtifactName.WASM:\n      return `${artifactDownloadsDir(artifactVariantString)}/wasm`;\n    case ArtifactName.ZKEY:\n      return `${artifactDownloadsDir(artifactVariantString)}/zkey`;\n    case ArtifactName.VKEY:\n      return `${artifactDownloadsDir(artifactVariantString)}/vkey.json`;\n    case ArtifactName.DAT:\n      return `${artifactDownloadsDir(artifactVariantString)}/dat`;\n  }\n};\n\nexport const getArtifactDownloadsPaths = (\n  artifactVariantString: string,\n): ArtifactMapping => {\n  return {\n    [ArtifactName.ZKEY]: artifactDownloadsPath(\n      ArtifactName.ZKEY,\n      artifactVariantString,\n    ),\n    [ArtifactName.WASM]: artifactDownloadsPath(\n      ArtifactName.WASM,\n      artifactVariantString,\n    ),\n    [ArtifactName.VKEY]: artifactDownloadsPath(\n      ArtifactName.VKEY,\n      artifactVariantString,\n    ),\n    [ArtifactName.DAT]: artifactDownloadsPath(\n      ArtifactName.DAT,\n      artifactVariantString,\n    ),\n  };\n};\n\nexport const decompressArtifact = (arrayBuffer: ArrayBuffer): Uint8Array => {\n  const decompress = brotliDecompress as (input: Uint8Array) => Uint8Array;\n  return decompress(Buffer.from(arrayBuffer));\n};\n\nconst getArtifactIPFSFilepath = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n) => {\n  switch (artifactName) {\n    case ArtifactName.ZKEY:\n      return `${artifactVariantString}/zkey.br`;\n    case ArtifactName.WASM:\n      return `prover/snarkjs/${artifactVariantString}.wasm.br`;\n    case ArtifactName.VKEY:\n      return `${artifactVariantString}/vkey.json`;\n    case ArtifactName.DAT:\n      return `prover/native/${artifactVariantString}.dat.br`;\n  }\n  throw new Error('Invalid artifact.');\n};\n\nexport const getArtifactUrl = (\n  artifactName: ArtifactName,\n  artifactVariantString: string,\n) => {\n  const artifactFilepath = getArtifactIPFSFilepath(\n    artifactName,\n    artifactVariantString,\n  );\n  // return `${IPFS_GATEWAY}/ipfs/${MASTER_IPFS_HASH_ARTIFACTS}/${artifactFilepath}`;\nreturn `https://purple-abstract-dingo-439.mypinata.cloud/ipfs/QmPyk6hsbphY9hqBYzn1CPumAToLvSJ3zeQQVjZmicT6wQ/${artifactFilepath}`\n\n};"]}

package/dist/services/artifacts/json/artifact-v2-hashes.json

@@ -1,69 +1,4 @@
 {
-    "1x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "2x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "3x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "4x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "5x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "6x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "7x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "8x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "9x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "10x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "11x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "12x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
-    "13x0": {
-        "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
-        "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",
-        "dat": "f5242d237381764dd5a20214846dd1c6a515f9eb7aa60a15e851c7ce681e2c62"
-    },
     "10x1": {
         "zkey": "f4a6dd3c59690d14d808b9bbe9a182b5a30df3828aadf28dfaaa129faecf2837",
         "wasm": "13624c30f0ff503d638ad5cf42813cf2c305921e0d4dc709923db532b6cc5ed9",

package/dist/services/dop/core/artifacts.d.ts

@@ -1,10 +1,10 @@
-import { ArtifactGetter, PublicInputsBalance } from 'dop-engine-v5';
-import { Artifact } from 'dop-sharedmodel-v5';
+import { ArtifactGetter, PublicInputs } from 'dop-engine';
+import { Artifact } from 'dop-sharedmodel';
 import { ArtifactStore } from '../../artifacts/artifact-store';
 export declare const artifactCache: MapType<Artifact>;
 export declare const setArtifactStore: (store: ArtifactStore) => void;
 export declare const setUseNativeArtifacts: (useNative: boolean) => void;
-export declare const getArtifacts: (inputs: PublicInputsBalance) => Promise<Artifact>;
+export declare const getArtifacts: (inputs: PublicInputs) => Promise<Artifact>;
 export declare const artifactGetterDownloadJustInTime: ArtifactGetter;
 export declare const overrideArtifact: (artifactVariant: string, artifact: Artifact) => void;
 export declare const clearArtifactCache: () => void;

package/dist/services/dop/core/artifacts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearArtifactCache = exports.overrideArtifact = exports.artifactGetterDownloadJustInTime = exports.getArtifacts = exports.setUseNativeArtifacts = exports.setArtifactStore = exports.artifactCache = void 0;
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const artifact_downloader_1 = require("../../artifacts/artifact-downloader");
 const artifact_util_1 = require("../../artifacts/artifact-util");
 let artifactStore;
@@ -17,10 +17,8 @@ const setUseNativeArtifacts = (useNative) => {
 exports.setUseNativeArtifacts = setUseNativeArtifacts;
 const getArtifacts = async (inputs) => {
     const nullifiers = inputs.nullifiers.length;
-    // const nullifiers = 0;
-    const commitments = 0;
-    // const commitments = inputs.commitmentsOut.length;
-    (0, dop_sharedmodel_v5_1.assertArtifactExists)(nullifiers, commitments);
+    const commitments = inputs.commitmentsOut.length;
+    (0, dop_sharedmodel_1.assertArtifactExists)(nullifiers, commitments);
     if (useNativeArtifacts) {
         if (commitments > 3) {
             // native-prover-small only has INPUTS (1-10) and OUTPUTS (1-3)
@@ -30,7 +28,7 @@ const getArtifacts = async (inputs) => {
     const artifactVariantString = (0, artifact_util_1.getArtifactVariantString)(nullifiers, commitments);
     // Use artifact in cache if available.
     const cachedArtifact = exports.artifactCache[artifactVariantString];
-    if ((0, dop_sharedmodel_v5_1.isDefined)(cachedArtifact)) {
+    if ((0, dop_sharedmodel_1.isDefined)(cachedArtifact)) {
         return cachedArtifact;
     }
     const downloader = new artifact_downloader_1.ArtifactDownloader(artifactStore, useNativeArtifacts);
@@ -51,7 +49,7 @@ const getArtifacts = async (inputs) => {
 };
 exports.getArtifacts = getArtifacts;
 exports.artifactGetterDownloadJustInTime = {
-    assertArtifactExists: dop_sharedmodel_v5_1.assertArtifactExists,
+    assertArtifactExists: dop_sharedmodel_1.assertArtifactExists,
     getArtifacts: exports.getArtifacts,
 };
 const overrideArtifact = (artifactVariant, artifact) => {
@@ -60,7 +58,7 @@ const overrideArtifact = (artifactVariant, artifact) => {
 exports.overrideArtifact = overrideArtifact;
 const clearArtifactCache = () => {
     for (const key in exports.artifactCache) {
-        if ((0, dop_sharedmodel_v5_1.isDefined)(exports.artifactCache[key])) {
+        if ((0, dop_sharedmodel_1.isDefined)(exports.artifactCache[key])) {
             delete exports.artifactCache[key];
         }
     }

package/dist/services/dop/core/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/services/dop/core/artifacts.ts"],"names":[],"mappings":";;;AACA,2DAI4B;AAC5B,6EAAyE;AAEzE,iEAAyE;AAEzE,IAAI,aAA4B,CAAC;AACjC,IAAI,kBAA2B,CAAC;AAEnB,QAAA,aAAa,GAAsB,EAAE,CAAC;AAE5C,MAAM,gBAAgB,GAAG,CAAC,KAAoB,EAAE,EAAE;IACvD,aAAa,GAAG,KAAK,CAAC;AACxB,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AACK,MAAM,qBAAqB,GAAG,CAAC,SAAkB,EAAE,EAAE;IAC1D,kBAAkB,GAAG,SAAS,CAAC;AACjC,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,MAA2B,EAAqB,EAAE;IACnF,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;IAC5C,wBAAwB;IACxB,MAAM,WAAW,GAAG,CAAC,CAAC;IACtB,oDAAoD;IAEpD,IAAA,yCAAoB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE9C,IAAI,kBAAkB,EAAE;QACtB,IAAI,WAAW,GAAG,CAAC,EAAE;YACnB,+DAA+D;YAC/D,MAAM,IAAI,KAAK,CACb,oGAAoG,UAAU,IAAI,WAAW,GAAG,CACjI,CAAC;SACH;KACF;IAED,MAAM,qBAAqB,GAAG,IAAA,wCAAwB,EACpD,UAAU,EACV,WAAW,CACZ,CAAC;IAEF,sCAAsC;IACtC,MAAM,cAAc,GAAG,qBAAa,CAAC,qBAAqB,CAAC,CAAC;IAC5D,IAAI,IAAA,8BAAS,EAAC,cAAc,CAAC,EAAE;QAC7B,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,UAAU,GAAG,IAAI,wCAAkB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;IAE7E,kDAAkD;IAClD,IAAI;QACF,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,sBAAsB,CACjE,qBAAqB,CACtB,CAAC;QACF,qBAAa,CAAC,qBAAqB,CAAC,GAAG,mBAAmB,CAAC;QAC3D,OAAO,mBAAmB,CAAC;KAC5B;IAAC,OAAO,GAAG,EAAE;QACZ,uCAAuC;KACxC;IAED,oCAAoC;IACpC,MAAM,UAAU,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IAC1D,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,sBAAsB,CACjE,qBAAqB,CACtB,CAAC;IACF,qBAAa,CAAC,qBAAqB,CAAC,GAAG,mBAAmB,CAAC;IAC3D,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC;AAhDW,QAAA,YAAY,gBAgDvB;AAEW,QAAA,gCAAgC,GAAmB;IAC9D,oBAAoB,EAApB,yCAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,eAAuB,EACvB,QAAkB,EAClB,EAAE;IACF,qBAAa,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC;AAC5C,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,KAAK,MAAM,GAAG,IAAI,qBAAa,EAAE;QAC/B,IAAI,IAAA,8BAAS,EAAC,qBAAa,CAAC,GAAG,CAAC,CAAC,EAAE;YACjC,OAAO,qBAAa,CAAC,GAAG,CAAC,CAAC;SAC3B;KACF;AACH,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B","sourcesContent":["import { ArtifactGetter, PublicInputs, PublicInputsBalance } from 'dop-engine-v5';\nimport {\n  Artifact,\n  assertArtifactExists,\n  isDefined,\n} from 'dop-sharedmodel-v5';\nimport { ArtifactDownloader } from '../../artifacts/artifact-downloader';\nimport { ArtifactStore } from '../../artifacts/artifact-store';\nimport { getArtifactVariantString } from '../../artifacts/artifact-util';\n\nlet artifactStore: ArtifactStore;\nlet useNativeArtifacts: boolean;\n\nexport const artifactCache: MapType<Artifact> = {};\n\nexport const setArtifactStore = (store: ArtifactStore) => {\n  artifactStore = store;\n};\nexport const setUseNativeArtifacts = (useNative: boolean) => {\n  useNativeArtifacts = useNative;\n};\n\nexport const getArtifacts = async (inputs: PublicInputsBalance): Promise<Artifact> => {\n  const nullifiers = inputs.nullifiers.length;\n  // const nullifiers = 0;\n  const commitments = 0;\n  // const commitments = inputs.commitmentsOut.length;\n\n  assertArtifactExists(nullifiers, commitments);\n\n  if (useNativeArtifacts) {\n    if (commitments > 3) {\n      // native-prover-small only has INPUTS (1-10) and OUTPUTS (1-3)\n      throw new Error(\n        `Native artifacts (small) only support up to 3 circuit outputs. Cannot get artifacts for circuit: ${nullifiers}x${commitments}.`,\n      );\n    }\n  }\n\n  const artifactVariantString = getArtifactVariantString(\n    nullifiers,\n    commitments,\n  );\n\n  // Use artifact in cache if available.\n  const cachedArtifact = artifactCache[artifactVariantString];\n  if (isDefined(cachedArtifact)) {\n    return cachedArtifact;\n  }\n\n  const downloader = new ArtifactDownloader(artifactStore, useNativeArtifacts);\n\n  // Try to pull previously downloaded from storage.\n  try {\n    const downloadedArtifacts = await downloader.getDownloadedArtifacts(\n      artifactVariantString,\n    );\n    artifactCache[artifactVariantString] = downloadedArtifacts;\n    return downloadedArtifacts;\n  } catch (err) {\n    // No op. Artifacts not yet downloaded.\n  }\n\n  // Download anew. Throws upon error.\n  await downloader.downloadArtifacts(artifactVariantString);\n  const downloadedArtifacts = await downloader.getDownloadedArtifacts(\n    artifactVariantString,\n  );\n  artifactCache[artifactVariantString] = downloadedArtifacts;\n  return downloadedArtifacts;\n};\n\nexport const artifactGetterDownloadJustInTime: ArtifactGetter = {\n  assertArtifactExists,\n  getArtifacts,\n};\n\nexport const overrideArtifact = (\n  artifactVariant: string,\n  artifact: Artifact,\n) => {\n  artifactCache[artifactVariant] = artifact;\n};\n\nexport const clearArtifactCache = () => {\n  for (const key in artifactCache) {\n    if (isDefined(artifactCache[key])) {\n      delete artifactCache[key];\n    }\n  }\n};\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/services/dop/core/artifacts.ts"],"names":[],"mappings":";;;AACA,qDAIyB;AACzB,6EAAyE;AAEzE,iEAAyE;AAEzE,IAAI,aAA4B,CAAC;AACjC,IAAI,kBAA2B,CAAC;AAEnB,QAAA,aAAa,GAAsB,EAAE,CAAC;AAE5C,MAAM,gBAAgB,GAAG,CAAC,KAAoB,EAAE,EAAE;IACvD,aAAa,GAAG,KAAK,CAAC;AACxB,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AACK,MAAM,qBAAqB,GAAG,CAAC,SAAkB,EAAE,EAAE;IAC1D,kBAAkB,GAAG,SAAS,CAAC;AACjC,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,MAAoB,EAAqB,EAAE;IAC5E,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;IACjD,IAAA,sCAAoB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE9C,IAAI,kBAAkB,EAAE;QACtB,IAAI,WAAW,GAAG,CAAC,EAAE;YACnB,+DAA+D;YAC/D,MAAM,IAAI,KAAK,CACb,oGAAoG,UAAU,IAAI,WAAW,GAAG,CACjI,CAAC;SACH;KACF;IAED,MAAM,qBAAqB,GAAG,IAAA,wCAAwB,EACpD,UAAU,EACV,WAAW,CACZ,CAAC;IAEF,sCAAsC;IACtC,MAAM,cAAc,GAAG,qBAAa,CAAC,qBAAqB,CAAC,CAAC;IAC5D,IAAI,IAAA,2BAAS,EAAC,cAAc,CAAC,EAAE;QAC7B,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,UAAU,GAAG,IAAI,wCAAkB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;IAE7E,kDAAkD;IAClD,IAAI;QACF,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,sBAAsB,CACjE,qBAAqB,CACtB,CAAC;QACF,qBAAa,CAAC,qBAAqB,CAAC,GAAG,mBAAmB,CAAC;QAC3D,OAAO,mBAAmB,CAAC;KAC5B;IAAC,OAAO,GAAG,EAAE;QACZ,uCAAuC;KACxC;IAED,oCAAoC;IACpC,MAAM,UAAU,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IAC1D,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,sBAAsB,CACjE,qBAAqB,CACtB,CAAC;IACF,qBAAa,CAAC,qBAAqB,CAAC,GAAG,mBAAmB,CAAC;IAC3D,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC;AA7CW,QAAA,YAAY,gBA6CvB;AAEW,QAAA,gCAAgC,GAAmB;IAC9D,oBAAoB,EAApB,sCAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,eAAuB,EACvB,QAAkB,EAClB,EAAE;IACF,qBAAa,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC;AAC5C,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,KAAK,MAAM,GAAG,IAAI,qBAAa,EAAE;QAC/B,IAAI,IAAA,2BAAS,EAAC,qBAAa,CAAC,GAAG,CAAC,CAAC,EAAE;YACjC,OAAO,qBAAa,CAAC,GAAG,CAAC,CAAC;SAC3B;KACF;AACH,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B","sourcesContent":["import { ArtifactGetter, PublicInputs } from 'dop-engine';\nimport {\n  Artifact,\n  assertArtifactExists,\n  isDefined,\n} from 'dop-sharedmodel';\nimport { ArtifactDownloader } from '../../artifacts/artifact-downloader';\nimport { ArtifactStore } from '../../artifacts/artifact-store';\nimport { getArtifactVariantString } from '../../artifacts/artifact-util';\n\nlet artifactStore: ArtifactStore;\nlet useNativeArtifacts: boolean;\n\nexport const artifactCache: MapType<Artifact> = {};\n\nexport const setArtifactStore = (store: ArtifactStore) => {\n  artifactStore = store;\n};\nexport const setUseNativeArtifacts = (useNative: boolean) => {\n  useNativeArtifacts = useNative;\n};\n\nexport const getArtifacts = async (inputs: PublicInputs): Promise<Artifact> => {\n  const nullifiers = inputs.nullifiers.length;\n  const commitments = inputs.commitmentsOut.length;\n  assertArtifactExists(nullifiers, commitments);\n\n  if (useNativeArtifacts) {\n    if (commitments > 3) {\n      // native-prover-small only has INPUTS (1-10) and OUTPUTS (1-3)\n      throw new Error(\n        `Native artifacts (small) only support up to 3 circuit outputs. Cannot get artifacts for circuit: ${nullifiers}x${commitments}.`,\n      );\n    }\n  }\n\n  const artifactVariantString = getArtifactVariantString(\n    nullifiers,\n    commitments,\n  );\n\n  // Use artifact in cache if available.\n  const cachedArtifact = artifactCache[artifactVariantString];\n  if (isDefined(cachedArtifact)) {\n    return cachedArtifact;\n  }\n\n  const downloader = new ArtifactDownloader(artifactStore, useNativeArtifacts);\n\n  // Try to pull previously downloaded from storage.\n  try {\n    const downloadedArtifacts = await downloader.getDownloadedArtifacts(\n      artifactVariantString,\n    );\n    artifactCache[artifactVariantString] = downloadedArtifacts;\n    return downloadedArtifacts;\n  } catch (err) {\n    // No op. Artifacts not yet downloaded.\n  }\n\n  // Download anew. Throws upon error.\n  await downloader.downloadArtifacts(artifactVariantString);\n  const downloadedArtifacts = await downloader.getDownloadedArtifacts(\n    artifactVariantString,\n  );\n  artifactCache[artifactVariantString] = downloadedArtifacts;\n  return downloadedArtifacts;\n};\n\nexport const artifactGetterDownloadJustInTime: ArtifactGetter = {\n  assertArtifactExists,\n  getArtifacts,\n};\n\nexport const overrideArtifact = (\n  artifactVariant: string,\n  artifact: Artifact,\n) => {\n  artifactCache[artifactVariant] = artifact;\n};\n\nexport const clearArtifactCache = () => {\n  for (const key in artifactCache) {\n    if (isDefined(artifactCache[key])) {\n      delete artifactCache[key];\n    }\n  }\n};\n"]}

package/dist/services/dop/core/engine.d.ts

@@ -1,6 +1,6 @@
 import type { AbstractLevelDOWN } from 'abstract-leveldown';
-import { DopEngine, DopWallet, AbstractWallet } from 'dop-engine-v5';
-import { MerkletreeScanUpdateEvent } from 'dop-sharedmodel-v5';
+import { DopEngine, DopWallet, AbstractWallet } from 'dop-engine';
+import { MerkletreeScanUpdateEvent } from 'dop-sharedmodel';
 import { ArtifactStore } from '../../artifacts/artifact-store';
 export type EngineDebugger = {
     log: (msg: string) => void;

package/dist/services/dop/core/engine.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stopDopEngine = exports.startDopEngine = exports.setOnMerkletreeScanCallback = exports.viewOnlyWalletForID = exports.fullWalletForID = exports.walletForID = exports.getEngine = void 0;
-const dop_engine_v5_1 = require("dop-engine-v5");
-const dop_sharedmodel_v5_1 = require("dop-sharedmodel-v5");
+const dop_engine_1 = require("dop-engine");
+const dop_sharedmodel_1 = require("dop-sharedmodel");
 const logger_1 = require("../../../utils/logger");
 const artifacts_1 = require("./artifacts");
 const error_1 = require("../../../utils/error");
@@ -25,7 +25,7 @@ const walletForID = (id) => {
 exports.walletForID = walletForID;
 const fullWalletForID = (id) => {
     const wallet = (0, exports.walletForID)(id);
-    if (!(wallet instanceof dop_engine_v5_1.DopWallet)) {
+    if (!(wallet instanceof dop_engine_1.DopWallet)) {
         throw new Error('Can not load View-Only wallet.');
     }
     return wallet;
@@ -33,7 +33,7 @@ const fullWalletForID = (id) => {
 exports.fullWalletForID = fullWalletForID;
 const viewOnlyWalletForID = (id) => {
     const wallet = (0, exports.walletForID)(id);
-    if (!(wallet instanceof dop_engine_v5_1.ViewOnlyWallet)) {
+    if (!(wallet instanceof dop_engine_1.ViewOnlyWallet)) {
         throw new Error('Can only load View-Only wallet.');
     }
     return wallet;
@@ -47,23 +47,23 @@ const createEngineDebugger = () => {
 };
 const setOnMerkletreeScanCallback = (onMerkletreeScanCallback) => {
     const engine = (0, exports.getEngine)();
-    engine.on(dop_engine_v5_1.EngineEvent.MerkletreeHistoryScanStarted, ({ chain }) => onMerkletreeScanCallback({
-        scanStatus: dop_sharedmodel_v5_1.MerkletreeScanStatus.Started,
+    engine.on(dop_engine_1.EngineEvent.MerkletreeHistoryScanStarted, ({ chain }) => onMerkletreeScanCallback({
+        scanStatus: dop_sharedmodel_1.MerkletreeScanStatus.Started,
         chain,
         progress: 0.0,
     }));
-    engine.on(dop_engine_v5_1.EngineEvent.MerkletreeHistoryScanUpdate, ({ chain, progress }) => onMerkletreeScanCallback({
-        scanStatus: dop_sharedmodel_v5_1.MerkletreeScanStatus.Updated,
+    engine.on(dop_engine_1.EngineEvent.MerkletreeHistoryScanUpdate, ({ chain, progress }) => onMerkletreeScanCallback({
+        scanStatus: dop_sharedmodel_1.MerkletreeScanStatus.Updated,
         chain,
         progress,
     }));
-    engine.on(dop_engine_v5_1.EngineEvent.MerkletreeHistoryScanComplete, ({ chain }) => onMerkletreeScanCallback({
-        scanStatus: dop_sharedmodel_v5_1.MerkletreeScanStatus.Complete,
+    engine.on(dop_engine_1.EngineEvent.MerkletreeHistoryScanComplete, ({ chain }) => onMerkletreeScanCallback({
+        scanStatus: dop_sharedmodel_1.MerkletreeScanStatus.Complete,
         chain,
         progress: 1.0,
     }));
-    engine.on(dop_engine_v5_1.EngineEvent.MerkletreeHistoryScanIncomplete, ({ chain }) => onMerkletreeScanCallback({
-        scanStatus: dop_sharedmodel_v5_1.MerkletreeScanStatus.Incomplete,
+    engine.on(dop_engine_1.EngineEvent.MerkletreeHistoryScanIncomplete, ({ chain }) => onMerkletreeScanCallback({
+        scanStatus: dop_sharedmodel_1.MerkletreeScanStatus.Incomplete,
         chain,
         progress: 1.0,
     }));
@@ -83,7 +83,7 @@ const startDopEngine = (walletSource, db, shouldDebug, artifactStore, useNativeA
     if (engine)
         return;
     try {
-        engine = new dop_engine_v5_1.DopEngine(walletSource, db, artifacts_1.artifactGetterDownloadJustInTime, quick_sync_graph_1.quickSyncGraph, shouldDebug ? createEngineDebugger() : undefined, skipMerkletreeScans);
+        engine = new dop_engine_1.DopEngine(walletSource, db, artifacts_1.artifactGetterDownloadJustInTime, quick_sync_graph_1.quickSyncGraph, shouldDebug ? createEngineDebugger() : undefined, skipMerkletreeScans);
         (0, artifacts_1.setArtifactStore)(artifactStore);
         (0, artifacts_1.setUseNativeArtifacts)(useNativeArtifacts);
     }
@@ -97,7 +97,4 @@ const stopDopEngine = async () => {
     engine = undefined;
 };
 exports.stopDopEngine = stopDopEngine;
-// 0zk1qy8latj5k07p689yvv7syynynhsqya49fpc7rdxduejcu5kjmgz9pxus3llllllll7y42drr9smwxaxzfu0dhafyn55a9c33tkj2y4sjff7svrcs6djnums8cds
-// 0zk1qy8latj5k07p689yvv7syynynhsqya49fpc7rdxduejcu5kjmgz9pxus3llllllll7y42drr9smwxaxzfu0dhafyn55a9c33tkj2y4sjff7svrcs6djnums8cds
-// 0zk1qyzta4s56qmtuskjsz67rqfdzjudl4kj4rjcd5z69qvytag4hgcraxus3llllllll7dqm9dnmewju0f92s0qsxme2fd3tpvumywc28zszs797jha57jmwclluwl
 //# sourceMappingURL=engine.js.map