chore: fixed secret call

EYBlockchain · Aug 29, 2024 · 0ae4fc3 · 0ae4fc3
1 parent beb16ca
commit 0ae4fc3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/codeGenerators/circuit/zokrates/toCircuit.ts b/src/codeGenerators/circuit/zokrates/toCircuit.ts
@@ -160,7 +160,10 @@ function codeGenerator(node: any) {
     case 'VariableDeclarationStatement': {
       const declarations = node.declarations.map(codeGenerator).join(', ');
       if (!node.initialValue) return `${declarations} = ${node.declarations.map(n => n.typeName.name === 'bool' ? 'false' : 0)}`;
-      if(node.initialValue.nodeType === 'InternalFunctionCall') return `${declarations} = ${node.initialValue.name}`;
+      if(node.initialValue.nodeType === 'InternalFunctionCall'){
+        if(!declarations) return ; 
+        return `${declarations} = ${node.initialValue.name}`;
+      } 
       const initialValue = codeGenerator(node.initialValue);
 
       return `${declarations} = ${initialValue}`;

diff --git a/src/transformers/visitors/orchestrationInternalFunctionCallVisitor.ts b/src/transformers/visitors/orchestrationInternalFunctionCallVisitor.ts
@@ -432,7 +432,7 @@ const internalCallVisitor = {
                             });  
                           });        
                           node.privateStates = Object.assign(node.privateStates,generateProofNode.privateStates);
-                          node.parameters = [...new Set([...node.parameters ,...generateProofNode.parameters])];
+                          node.parameters = [...new Set([...node.parameters ,...generateProofNode.parameters, ...state.returnPara])];
                           break;
                         }
                         case 'SendTransaction': {
@@ -527,11 +527,13 @@ FunctionCall: {
           decNode.declarations[0].isAccessed = true;
           decNode.declarations[0].interactsWithSecret = true;
           callingfnDefPath.node._newASTPointer.body.preStatements.splice(1,0,decNode);
-          const returnPara = functionReferncedNode.node.returnParameters.parameters[0].name;
+           const returnPara = functionReferncedNode.node.returnParameters.parameters[0].name;
             newNode = buildNode('InternalFunctionCall', {
              name: returnPara,
              internalFunctionInteractsWithSecret: internalFunctionInteractsWithSecret,
            });
+           console.log(parent)
+           parent.interactsWithSecret ? state.returnPara = returnPara : ' ';
 
           const functionParams = callingfnDefPath.node._newASTPointer.body.preStatements;
           // console.log(functionParams);

diff --git a/src/transformers/visitors/toCircuitVisitor.ts b/src/transformers/visitors/toCircuitVisitor.ts
@@ -1587,12 +1587,13 @@ if(parent.nodeType === 'VariableDeclarationStatement') {
     name: returnPara,
     internalFunctionInteractsWithSecret: internalFunctionInteractsWithSecret, // return
   });
+  if(parent._newASTPointer.declarations.length > 0){
   const functionParams = callingfnDefPath.node._newASTPointer.parameters.parameters.map(param => param.name);
   if(!functionParams.includes(returnPara)){
     callingfnDefPath.node._newASTPointer.parameters.parameters.push(functionReferncedNode.node.returnParameters.parameters[0]._newASTPointer);
     callingfnDefPath.node._newASTPointer.parameters.parameters[functionParams.length].declarationType = 'parameter';
     callingfnDefPath.node._newASTPointer.parameters.parameters[functionParams.length].interactsWithSecret = true;
-  }
+  }}
 } else
      { 
       newNode = buildNode('InternalFunctionCall', {