Fixed redundant protocol type generation in the hardhat.config.ts

dl-solarity · Nov 8, 2024 · 6018891 · 6018891
1 parent a68981e
commit 6018891
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [v0.4.2]
+
+* Fixed redundant protocol type generation in the `hardhat.config.ts`.
+
 ## [v0.3.1-v0.4.1]
 
 * Added an ability to provide protocol type in the ZKType config structure (#17)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solarity/zktype",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Unleash TypeScript bindings for Circom circuits",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/core/ZkitTSGenerator.ts b/src/core/ZkitTSGenerator.ts
@@ -16,6 +16,7 @@ import {
   GeneratedCircuitWrapperResult,
   CircuitSet,
   ProtocolType,
+  ArtifactWithPath,
 } from "../types";
 
 import { normalizeName } from "../utils";
@@ -37,7 +38,6 @@ export default class ZkitTSGenerator extends BaseTSGenerator {
         circuitClasses.push({
           name: this._getCircuitName(artifacts[0].circuitArtifact),
           object: this._getCircuitName(artifacts[0].circuitArtifact),
-          protocol: artifacts[0].protocol,
         });
 
         continue;
@@ -59,11 +59,12 @@ export default class ZkitTSGenerator extends BaseTSGenerator {
         continue;
       }
 
+      const isProtocolTypeTheSame = this._isProtocolTypeTheSame(artifacts);
       for (const artifact of artifacts) {
         circuitClasses.push({
           name: this._getFullCircuitName(artifact.circuitArtifact),
           object: this._getObjectPath(artifact.pathToGeneratedFile),
-          protocol: artifact.protocol,
+          protocol: isProtocolTypeTheSame ? undefined : artifact.protocol,
         });
       }
     }
@@ -244,4 +245,8 @@ export default class ZkitTSGenerator extends BaseTSGenerator {
 
     return new Set(circuitArtifact.baseCircuitInfo.protocol);
   }
+
+  private _isProtocolTypeTheSame(artifactWithPaths: ArtifactWithPath[]) {
+    return artifactWithPaths.every((circuit) => circuit.protocol === artifactWithPaths[0].protocol);
+  }
 }
diff --git a/src/types/common.ts b/src/types/common.ts
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,4 +1,3 @@
 export * from "./config";
-export * from "./common";
 export * from "./typesGenerator";
 export * from "./circuitArtifact";