From c04dae6260607915c597cb5bfa11b48f0da83291 Mon Sep 17 00:00:00 2001 From: Oleh Komendant Date: Thu, 31 Oct 2024 14:24:31 +0200 Subject: [PATCH 1/2] Set O1 optimization by default --- README.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/config/config.ts | 2 +- src/types/zkit-config.ts | 2 +- test/constants.ts | 2 +- .../hardhat-project-defined-config/hardhat.config.ts | 2 +- test/integration/setup/config.ts | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8c5d24d..207801d 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ module.exports = { skipFiles: [], c: false, json: false, - optimization: "O2", + optimization: "O1", }, setupSettings: { contributionSettings: { diff --git a/package-lock.json b/package-lock.json index b3ad23a..e061402 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@solarity/hardhat-zkit", - "version": "0.4.11", + "version": "0.4.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@solarity/hardhat-zkit", - "version": "0.4.11", + "version": "0.4.12", "license": "MIT", "workspaces": [ "test/fixture-projects/*" diff --git a/package.json b/package.json index 4c9762e..f722b5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@solarity/hardhat-zkit", - "version": "0.4.11", + "version": "0.4.12", "description": "The ultimate TypeScript environment for Circom development", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", diff --git a/src/config/config.ts b/src/config/config.ts index e5d05a4..6a562c8 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -14,7 +14,7 @@ const defaultConfig: ZKitConfig = { skipFiles: [], c: false, json: false, - optimization: undefined, + optimization: "O1", }, setupSettings: { contributionSettings: { diff --git a/src/types/zkit-config.ts b/src/types/zkit-config.ts index 9cc84c2..18138b8 100644 --- a/src/types/zkit-config.ts +++ b/src/types/zkit-config.ts @@ -16,7 +16,7 @@ export type CompilationSettings = FileFilterSettings & { artifactsDir: string; c: boolean; json: boolean; - optimization?: "O0" | "O1" | "O2"; + optimization: "O0" | "O1" | "O2"; }; export type SetupSettings = FileFilterSettings & { diff --git a/test/constants.ts b/test/constants.ts index 93899d7..84e4988 100644 --- a/test/constants.ts +++ b/test/constants.ts @@ -7,7 +7,7 @@ export const defaultCompileFlags: CompileFlags = { c: false, json: false, O0: false, - O1: false, + O1: true, O2: false, }; diff --git a/test/fixture-projects/hardhat-project-defined-config/hardhat.config.ts b/test/fixture-projects/hardhat-project-defined-config/hardhat.config.ts index df96dbe..bed0556 100644 --- a/test/fixture-projects/hardhat-project-defined-config/hardhat.config.ts +++ b/test/fixture-projects/hardhat-project-defined-config/hardhat.config.ts @@ -8,7 +8,7 @@ const defaultConfig: HardhatUserConfig = { circuitsDir: "circuits", compilationSettings: { skipFiles: ["vendor"], - optimization: "O1", + optimization: "O2", }, setupSettings: { ptauDir: "zkit/ptau", diff --git a/test/integration/setup/config.ts b/test/integration/setup/config.ts index dfaca8e..6790425 100644 --- a/test/integration/setup/config.ts +++ b/test/integration/setup/config.ts @@ -28,7 +28,7 @@ describe("config", () => { skipFiles: ["vendor"], c: false, json: false, - optimization: "O1", + optimization: "O2", }, setupSettings: { contributionSettings: { @@ -72,7 +72,7 @@ describe("config", () => { skipFiles: [], c: false, json: false, - optimization: undefined, + optimization: "O1", }, setupSettings: { contributionSettings: { From 241ecefc415783cf777f5136f00dc547f37aed26 Mon Sep 17 00:00:00 2001 From: Artem Chystiakov Date: Fri, 1 Nov 2024 13:59:52 +0200 Subject: [PATCH 2/2] rollback version --- package-lock.json | 4 ++-- package.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e061402..b3ad23a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@solarity/hardhat-zkit", - "version": "0.4.12", + "version": "0.4.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@solarity/hardhat-zkit", - "version": "0.4.12", + "version": "0.4.11", "license": "MIT", "workspaces": [ "test/fixture-projects/*" diff --git a/package.json b/package.json index f722b5e..c84034d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@solarity/hardhat-zkit", - "version": "0.4.12", + "version": "0.4.11", "description": "The ultimate TypeScript environment for Circom development", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,6 +23,7 @@ "distributedlab", "solarity", "circom", + "snarkjs", "zk", "zkit" ],