Fix compile cache schema (#49)

This commit is contained in:
Oleg Komendant
2024-10-30 17:31:35 +02:00
committed by GitHub
parent 93224ef8d6
commit 755e538afe
4 changed files with 31 additions and 21 deletions

11
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@solarity/hardhat-zkit",
"version": "0.4.10",
"version": "0.4.11",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@solarity/hardhat-zkit",
"version": "0.4.10",
"version": "0.4.11",
"license": "MIT",
"workspaces": [
"test/fixture-projects/*"
@@ -5751,6 +5751,10 @@
"resolved": "test/fixture-projects/hardhat-project-with-complex-circuits",
"link": true
},
"node_modules/hardhat-project-with-constraint-simplification": {
"resolved": "test/fixture-projects/hardhat-project-with-constraint-simplification",
"link": true
},
"node_modules/hardhat/node_modules/ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -9863,6 +9867,9 @@
},
"test/fixture-projects/hardhat-project-with-complex-circuits": {
"version": "1.0.0"
},
"test/fixture-projects/hardhat-project-with-constraint-simplification": {
"version": "1.0.0"
}
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@solarity/hardhat-zkit",
"version": "0.4.10",
"version": "0.4.11",
"description": "The ultimate TypeScript environment for Circom development",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",

View File

@@ -63,6 +63,9 @@ export const CompileFlagsSchema = z.object({
sym: z.boolean(),
json: z.boolean(),
c: z.boolean(),
O0: z.boolean(),
O1: z.boolean(),
O2: z.boolean(),
});
export const ResolvedFileDataSchema = z.object({

View File

@@ -111,6 +111,20 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
}
};
visitSignalDeclaration = (ctx: SignalDeclarationContext) => {
const signalDefinition = ctx.signalDefinition();
let signalType = "intermediate";
if (signalDefinition.SIGNAL_TYPE()) {
signalType = signalDefinition.SIGNAL_TYPE().getText();
}
[signalDefinition.identifier(), ...ctx.identifier_list()].forEach((identifier) =>
this._saveInputData(identifier, signalType),
);
};
visitVarDeclaration = (ctx: VarDeclarationContext) => {
const vars = this._parseVarDefinition(ctx.varDefinition());
@@ -129,11 +143,11 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
});
};
_parseVarDefinition = (ctx: VarDefinitionContext): string[] => {
private _parseVarDefinition(ctx: VarDefinitionContext): string[] {
return ctx.identifier_list().map((identifier) => identifier.ID(0).getText());
};
}
_parseRHSValue = (ctx: RhsValueContext): bigint[] => {
private _parseRHSValue(ctx: RhsValueContext): bigint[] {
const expressionVisitor = new CircomExpressionVisitor(true, this.vars);
/**
@@ -183,21 +197,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
}
throw new HardhatZKitError(`RHS value as function call is not supported - ${ctx.getText()}`);
};
visitSignalDeclaration = (ctx: SignalDeclarationContext) => {
const signalDefinition = ctx.signalDefinition();
let signalType = "intermediate";
if (signalDefinition.SIGNAL_TYPE()) {
signalType = signalDefinition.SIGNAL_TYPE().getText();
}
[signalDefinition.identifier(), ...ctx.identifier_list()].forEach((identifier) =>
this._saveInputData(identifier, signalType),
);
};
}
private _saveInputData(identifier: IdentifierContext, signalType: string) {
const parsedData = this._parseIdentifier(identifier);