chore: added a fix for a bug

EYBlockchain · Apr 4, 2024 · fb60b1d · fb60b1d
1 parent c42542a
commit fb60b1d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/boilerplate/orchestration/javascript/nodes/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/nodes/boilerplate-generator.ts
@@ -52,7 +52,7 @@ export function buildPrivateStateNode(nodeType: string, fields: any = {}): any {
       };
     }
     case 'WritePreimage': {
-      const { id, increment, burnedOnly, indicator = {} } = fields;
+      const { id, increment, burnedOnly, reinitialisedOnly, indicator = {} } = fields
       return {
         increment,
         stateVarId: id,
@@ -64,6 +64,7 @@ export function buildPrivateStateNode(nodeType: string, fields: any = {}): any {
         mappingName: indicator.isMapping ? indicator.node?.name : null,
         nullifierRequired: indicator.isNullified,
         burnedOnly,
+        reinitialisedOnly,
         isOwned: indicator.isOwned,
         mappingOwnershipType: indicator.mappingOwnershipType,
         owner: indicator.isOwned

diff --git a/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts
@@ -2,7 +2,7 @@
 
 // Q: how are we merging mapping key and ownerPK in edge case?
 // Q: should we reduce constraints a mapping's commitment's preimage by not having the extra inner hash? Not at the moment, because it adds complexity to transpilation.
-import fs from 'fs';
+import fs, { stat } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
@@ -474,8 +474,9 @@ sendTransaction = {
       mappingName,
       mappingKey,
       burnedOnly,
-      structProperties,
       reinitialisedOnly,
+      structProperties,
+
     }): string[] {
       let value;
       switch (stateType) {
@@ -521,7 +522,7 @@ sendTransaction = {
             default:
               value = structProperties ? `{ ${structProperties.map(p => `${p}: ${stateName}.${p}`)} }` : `${stateName}`;
               return [`
-                \n${reinitialisedOnly? ' ': `if (${stateName}_commitmentExists) await markNullified(${stateName}_currentCommitment, secretKey.hex(32));`}
+                \n${reinitialisedOnly ? ' ': `if (${stateName}_commitmentExists) await markNullified(${stateName}_currentCommitment, secretKey.hex(32));`}
                 \nawait storeCommitment({
                   hash: ${stateName}_newCommitment,
                   name: '${mappingName}',

diff --git a/src/boilerplate/orchestration/javascript/raw/toOrchestration.ts b/src/boilerplate/orchestration/javascript/raw/toOrchestration.ts
@@ -155,7 +155,6 @@ export const generateProofBoilerplate = (node: any) => {
 
       });
     // then we build boilerplate code per state
-    console.log(stateNode);
     switch (stateNode.isWhole) {
       case true:
         output.push(
@@ -596,7 +595,7 @@ export const OrchestrationCodeBoilerPlate: any = (node: any) => {
                       : ``,
                     burnedOnly: false,
                     structProperties: stateNode.structProperties,
-                    reinitialisedOnly: stateNode.reinitialisedOnly,
+                    reinitialisedOnly: false,
                   }));
 
                 break;
@@ -631,8 +630,9 @@ export const OrchestrationCodeBoilerPlate: any = (node: any) => {
                   ? `${stateName}_stateVarId_key.integer`
                   : ``,
                 burnedOnly: stateNode.burnedOnly,
-                structProperties: stateNode.structProperties,
                 reinitialisedOnly: stateNode.reinitialisedOnly,
+                structProperties: stateNode.structProperties,
+
               }));
         }
       }

diff --git a/src/transformers/visitors/toOrchestrationVisitor.ts b/src/transformers/visitors/toOrchestrationVisitor.ts
@@ -567,9 +567,12 @@ const visitor = {
               burnedOnly:
                 stateVarIndicator.isBurned &&
                 !stateVarIndicator.newCommitmentsRequired,
+              reinitialisedOnly: stateVarIndicator.reinitialisable &&
+              !stateVarIndicator.isNullified,  
             });
           }
         }
+
 
         if (node.kind === 'constructor') {
           newNodes.writePreimageNode.isConstructor = true;