Lydia/bugs in InternalFunctionCall4 (formerly named InternalFunctionCall2)

src/boilerplate/circuit/zokrates/raw/BoilerplateGenerator.ts

@@ -124,9 +124,9 @@ class BoilerplateGenerator {
       if(isAccessed && !isNullified) 
       lines = [
         `
-        // Create the Nullifier  for ${x} and no need to nnullify it as its accessed only:
+        // Create the Nullifier  for ${x} and no need to nullify it as its accessed only:
 
-        field ${x}_oldCommitment_nullifier = poseidon([\\
+        field ${x}_oldCommitment_nullifier_check_field = poseidon([\\
           ${x}_stateVarId_field,\\
           ${x}_oldCommitment_owner_secretKey,\\
           ${x}_oldCommitment_salt\\
@@ -137,7 +137,7 @@ class BoilerplateGenerator {
         assert(\\
           nullifierRoot == checkproof(\\
             ${x}_nullifier_nonmembershipWitness_siblingPath,\\
-            ${x}_oldCommitment_nullifier\\
+            ${x}_oldCommitment_nullifier_check_field\\
            )\
        )
         `,

src/boilerplate/contract/solidity/nodes/ContractBoilerplateGenerator.ts

@@ -10,9 +10,7 @@ class ContractBoilerplateGenerator {
   scope : Scope;
   constructor(scope: Scope) {
     if (bpCache.has(scope)) return bpCache.get(scope);
-
     this.scope = scope;
-
     bpCache.set(scope, this);
   }
 
@@ -80,7 +78,7 @@ class ContractBoilerplateGenerator {
         indicators: { nullifiersRequired, oldCommitmentAccessRequired, newCommitmentsRequired, containsAccessedOnlyState, encryptionRequired },
       } = scope;
       const fnDefBindings = scope.filterBindings(
-        (b: any) => b.kind === 'FunctionDefinition' && b.path.containsSecret,
+        (b: any) => b.kind === 'FunctionDefinition' && (b.path.containsSecret || b.path.scope.indicators.internalFunctionInteractsWithSecret),
       );
       let functionNames = Object.values(fnDefBindings).map((b: any) => b.path.getUniqueFunctionName());
       if (isjoinSplitCommitmentsFunction.includes('true')) { 
@@ -130,9 +128,11 @@ class ContractBoilerplateGenerator {
         params?.forEach(circuitParamNode => {
           switch (circuitParamNode.bpType) {
             case 'nullification':
+              if (!newList.includes('nullifierRoot')) 
+                  newList.push('nullifierRoot');
               if (circuitParamNode.isNullified) {
-                if (!newList.includes('nullifierRoot')) 
-                  newList.push('nullifierRoot')
+                if (!newList.includes('newNullifierRoot')) 
+                  newList.push('newNullifierRoot');
                 newList.push('nullifier');
 
               } 
@@ -177,7 +177,7 @@ class ContractBoilerplateGenerator {
       }
      circuitParams[ functionName ] = parameterList;
     }
-      const constructorContainsSecret = Object.values(this.scope.bindings).some((binding: any) => binding.node.kind === 'constructor')
+      const constructorContainsSecret = Object.values(this.scope.bindings).some((binding: any) => binding.node.kind === 'constructor');
       return { nullifiersRequired, oldCommitmentAccessRequired, newCommitmentsRequired, containsAccessedOnlyState, encryptionRequired, constructorContainsSecret, circuitParams, isjoinSplitCommitmentsFunction};
     },
 

src/boilerplate/contract/solidity/raw/ContractBoilerplateGenerator.ts

@@ -126,7 +126,9 @@ class ContractBoilerplateGenerator {
         switch (input) {
           case 'nullifierRoot':  
             verifyInput.push( `
-            inputs[k++] = _inputs.nullifierRoot;`); 
+            inputs[k++] = _inputs.nullifierRoot;`);  
+            break; 
+          case 'newNullifierRoot':  
             verifyInput.push( `
             inputs[k++] = _inputs.latestNullifierRoot;`); 
             break; 
@@ -219,7 +221,6 @@ class ContractBoilerplateGenerator {
               newCommitments: 0,
               encryption: 0,
             };
-
             _inputs.map(i => verifyInputsMap(type, i, counter));
 
 

src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts

@@ -439,6 +439,7 @@ class BoilerplateGenerator {
       burnedOnly,
       accessedOnly,
       nullifierRootRequired,
+      newNullifierRootRequired,
       initialisationRequired,
       encryptionRequired,
       rootRequired,
@@ -466,7 +467,7 @@ class BoilerplateGenerator {
               \tsecretKey.integer,
               \tsecretKey.integer,
               ${nullifierRootRequired ? `\t${stateName}_nullifierRoot.integer,` : ``}
-              ${nullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
+              ${newNullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
               \t${stateName}_0_nullifier.integer,
               \t${stateName}_0_nullifier_path.integer,
               \t${stateName}_0_nullifier_updatedpath.integer,
@@ -501,7 +502,7 @@ class BoilerplateGenerator {
                       ${parameters.join('\n')}${stateVarIds.join('\n')}
                       \tsecretKey.integer,
                       ${nullifierRootRequired ? `\t${stateName}_nullifierRoot.integer,` : ``}
-                      ${nullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
+                      ${newNullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
                       \t${stateName}_nullifier.integer,
                       \t${stateName}_nullifier_path.integer,
                       \t${stateName}_nullifier_updatedpath.integer,
@@ -529,7 +530,7 @@ class BoilerplateGenerator {
                       ${parameters.join('\n')}${stateVarIds.join('\n')}
                       \t${stateName}_commitmentExists ? secretKey.integer: generalise(0).integer,
                       ${nullifierRootRequired ? `\t${stateName}_nullifierRoot.integer,` : ``}
-                      ${nullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
+                      ${newNullifierRootRequired ? `\t${stateName}_newNullifierRoot.integer,` : ``}
                       \t${stateName}_nullifier.integer,
                       \t${stateName}_nullifier_path.integer,
                       \t${stateName}_nullifier_updatedpath.integer,

src/boilerplate/orchestration/javascript/raw/toOrchestration.ts

@@ -91,19 +91,19 @@ export const sendTransactionBoilerplate = (node: any) => {
         break;
       case false:
       default:
-        // whole
+        // whole 
         if (!stateNode.reinitialisedOnly)
           output[2].push(`${privateStateName}_root.integer`);
-          if (!stateNode.accessedOnly && !stateNode.reinitialisedOnly) {
-            output[1].push(`${privateStateName}_nullifier.integer`);
-            output[0].push(`${privateStateName}_nullifierRoot.integer`,`${privateStateName}_newNullifierRoot.integer`);
-          }
-          if (!stateNode.accessedOnly && !stateNode.burnedOnly)
-            output[3].push(`${privateStateName}_newCommitment.integer`);
-          if (stateNode.encryptionRequired) {
-            output[4].push(`${privateStateName}_cipherText`);
-            output[5].push(`${privateStateName}_encKey`);
-          }
+        if (!stateNode.accessedOnly && !stateNode.reinitialisedOnly) {
+          output[1].push(`${privateStateName}_nullifier.integer`);
+          output[0].push(`${privateStateName}_nullifierRoot.integer`,`${privateStateName}_newNullifierRoot.integer`);
+        }
+        if (!stateNode.accessedOnly && !stateNode.burnedOnly)
+          output[3].push(`${privateStateName}_newCommitment.integer`);
+        if (stateNode.encryptionRequired) {
+          output[4].push(`${privateStateName}_cipherText`);
+          output[5].push(`${privateStateName}_encKey`);
+        }
 
         break;
     }
@@ -117,6 +117,7 @@ export const generateProofBoilerplate = (node: any) => {
   const cipherTextLength: number[] = [];
   let containsRoot = false;
   let containsNullifierRoot = false;
+  let containsNewNullifierRoot = false;
   const privateStateNames = Object.keys(node.privateStates);
   let stateName: string;
   let stateNode: any;
@@ -181,13 +182,15 @@ export const generateProofBoilerplate = (node: any) => {
             burnedOnly: stateNode.burnedOnly,
             accessedOnly: stateNode.accessedOnly,
             nullifierRootRequired: !containsNullifierRoot,
+            newNullifierRootRequired: !containsNewNullifierRoot,
             initialisationRequired: stateNode.initialisationRequired,
             encryptionRequired: stateNode.encryptionRequired,
             rootRequired: !containsRoot,
             parameters,
           })
         );
-        if(stateNode.nullifierRequired) containsNullifierRoot = true;
+        if(stateNode.nullifierRequired || stateNode.accessedOnly) containsNullifierRoot = true;
+        if(stateNode.nullifierRequired) containsNewNullifierRoot = true;
         if (!stateNode.reinitialisedOnly) containsRoot = true;
         break;
 
@@ -216,6 +219,7 @@ export const generateProofBoilerplate = (node: any) => {
                 reinitialisedOnly: false,
                 burnedOnly: false,
                 nullifierRootRequired: !containsNullifierRoot,
+                newNullifierRootRequired: !containsNewNullifierRoot,
                 initialisationRequired: false,
                 encryptionRequired: stateNode.encryptionRequired,
                 rootRequired: !containsRoot,
@@ -224,6 +228,7 @@ export const generateProofBoilerplate = (node: any) => {
               })
             );
             containsNullifierRoot = true;
+            containsNewNullifierRoot = true;
             containsRoot = true;
             break;
           case false:
@@ -247,6 +252,7 @@ export const generateProofBoilerplate = (node: any) => {
                 reinitialisedOnly: false,
                 burnedOnly: false,
                 nullifierRootRequired: false,
+                newNullifierRootRequired: false,
                 initialisationRequired: false,
                 encryptionRequired: stateNode.encryptionRequired,
                 rootRequired: false,
@@ -814,16 +820,14 @@ export const OrchestrationCodeBoilerPlate: any = (node: any) => {
       // params[1] = arr of commitment root(s)
       // params[2] =  arr of nullifiers 
       // params[3] = arr of commitments
-
 
-      if (params[0][0][0]) params[0][0] = `${params[0][0][0]},${params[0][0][1]},`; // nullifierRoot - array 
+      if (params[0][0][0]) params[0][0] = `${params[0][0][0]},${params[0][0][1]},`; // nullifierRoot - array
       if (params[0][2][0]) params[0][2] = `${params[0][2][0]},`; // commitmentRoot - array 
       if (params[0][1][0]) params[0][1] = `[${params[0][1]}],`; // nullifiers - array
       if (params[0][3][0]) params[0][3] = `[${params[0][3]}],`; // commitments - array
       if (params[0][4][0]) params[0][4] = `[${params[0][4]}],`; // cipherText - array of arrays
       if (params[0][5][0]) params[0][5] = `[${params[0][5]}],`; // cipherText - array of arrays
 
-
       if (node.functionName === 'cnstrctr') return {
         statements: [
           `\n\n// Save transaction for the constructor:

src/codeGenerators/orchestration/nodejs/toOrchestration.ts

@@ -90,7 +90,8 @@ export default function codeGenerator(node: any, options: any = {}): any {
         return `${getAccessedValue(node.declarations[0].name)}`;
       }
 
-      if (
+      if (!node.initialValue && !node.declarations[0].isAccessed) return `\nlet ${codeGenerator(node.declarations[0])};`;
+      if (node.initialValue &&
         node.initialValue.operator &&
         !node.initialValue.operator.includes('=')
       )
@@ -117,8 +118,9 @@ export default function codeGenerator(node: any, options: any = {}): any {
       }
 
     case 'ExpressionStatement':
-      if (!node.incrementsSecretState && node.interactsWithSecret)
+      if (!node.incrementsSecretState && (node.interactsWithSecret || node.expression?.internalFunctionInteractsWithSecret)){
         return `\n${codeGenerator(node.expression)};`;
+      }
       if (!node.interactsWithSecret)
         return `\n// non-secret line would go here but has been filtered out`;
       return `\n// increment would go here but has been filtered out`;