fix: _ instead of . in circuit causing compilation error for SimpleSt…

…ruct2 and for incremented non-structs alllow for multiple incrementations
EYBlockchain · Jul 8, 2024 · 1f65c4c · 1f65c4c
1 parent 68fe11c
commit 1f65c4c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/boilerplate/circuit/zokrates/raw/BoilerplateGenerator.ts b/src/boilerplate/circuit/zokrates/raw/BoilerplateGenerator.ts
@@ -376,7 +376,7 @@ class BoilerplateGenerator {
 
         }
         else {
-          lines.push(`${typeName} ${x}_newCommitment_value = ${typeName} { ${structProperties.map(p => ` ${p}: ${isWhole ? `${y}.${p}` : `${y}_${p}`}`)} }\n`);
+          lines.push(`${typeName} ${x}_newCommitment_value = ${typeName} { ${structProperties.map(p => ` ${p}: ${y}.${p}`)} }\n`);
           if (structPropertiesTypes) {
             structPropertiesTypes.forEach(property => {
               if (property.typeName === 'bool'){

diff --git a/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts
@@ -119,7 +119,9 @@ class BoilerplateGenerator {
             \n\n// read preimage for incremented state
             ${stateName}_newOwnerPublicKey = ${newOwnerStatment}
             ${stateVarIds.join('\n')}
-            \n`];
+            \n
+            let ${stateName}_newCommitmentValue = generalise(0);
+            `];
         case 'decrement':
           if (structProperties)
             return [`

diff --git a/src/codeGenerators/orchestration/nodejs/toOrchestration.ts b/src/codeGenerators/orchestration/nodejs/toOrchestration.ts
@@ -126,13 +126,14 @@ export default function codeGenerator(node: any, options: any = {}): any {
 
       if (node.incrementsSecretState && (node.interactsWithSecret || node.expression?.internalFunctionInteractsWithSecret)){
         let privateStateName = node.privateStateName.replace(/\./g, '_');
+        let increments = codeGenerator(node.expression.rightHandSide);
         if (typeof node.increments === 'object' && node.increments !== null) {
           if (node.expression.leftHandSide.nodeType === 'MemberAccess'){
             let propName = node.expression.leftHandSide.memberName;
-            return  `\nconst ${privateStateName}_newCommitmentValue = generalise(${node.increments[propName]});\n`;
+            return  `\n${privateStateName}_newCommitmentValue = generalise(${node.increments[propName]});\n`;
           }
         };
-        return  `\nconst ${privateStateName}_newCommitmentValue = generalise(${node.increments});\n`;
+        return  `\n${privateStateName}_newCommitmentValue = generalise(parseInt(${privateStateName}_newCommitmentValue.integer, 10) + ${increments});\n`;
       }
 
       if (!node.interactsWithSecret)