last update remove extra code

EYBlockchain · Mar 28, 2024 · 02db13f · 02db13f
1 parent d09b77e
commit 02db13f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 142 deletions.
diff --git a/src/boilerplate/common/commitment-storage.mjs b/src/boilerplate/common/commitment-storage.mjs
@@ -109,8 +109,8 @@ export async function getNullifiedCommitments() {
 }
 
 /**
- * Retourne la somme des valeurs de tous les engagements nullifiés.
- * @returns {Promise<number>} La somme des valeurs de tous les engagements nullifiés.
+ * Retourne la somme des valeurs de tous les engagements non nullifiés.
+ * @returns {Promise<number>} La somme des valeurs de tous les engagements non nullifiés.
  */
 export async function getBalance() {
     const connection = await mongo.connection(MONGO_URL);

diff --git a/src/boilerplate/common/web3.mjs b/src/boilerplate/common/web3.mjs
@@ -47,44 +47,5 @@ export default {
 };
 
 
-/*import Web3 from 'web3';
-import config from 'config';
-import logger from './logger.mjs';
-
-export default {
-  connection() {
-    if (!this.web3) this.connect();
-    return this.web3;
-  },
-
-  
-  connect() {
-    if (this.web3) return this.web3.currentProvider;
-
-    logger.http('Blockchain Connecting ...');
-    const provider = new Web3.providers.WebsocketProvider(
-      config.web3.url,
-      null,
-      config.web3.options,
-    );
-
-    provider.on('error', console.error);
-    provider.on('connect', () => logger.http('Blockchain Connected ...'));
-    provider.on('end', console.error);
 
-    this.web3 = new Web3(provider);
-
-    return provider;
-  },
-
- 
-   * @return {Boolean} - Resolves to true or false
-   
-  isConnected() {
-    if (this.web3) {
-      return this.web3.eth.net.isListening();
-    }
-    return false;
-  },
-};*/
 
diff --git a/src/boilerplate/orchestration/javascript/nodes/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/nodes/boilerplate-generator.ts
@@ -176,23 +176,7 @@ export function buildPrivateStateNode(nodeType: string, fields: any = {}): any {
       throw new TypeError(nodeType);
   }
 }
-export function buildPublicStateNode(nodeType: string, fields: any = {}): any {
-  switch (nodeType) {
-    case 'SendTransaction': {
-      const {
-
-        accessedOnly,
-      } = fields;
-      return {
-        nodeType,
-        accessedOnly,
-      };
-    }
-    // Ajoutez d'autres cas selon les besoins pour d'autres types de nœuds
-    default:
-      throw new TypeError(nodeType);
-  }
-}
+
 
 
 /**

diff --git a/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts
@@ -405,7 +405,7 @@ class BoilerplateGenerator {
         `\nimport fs from 'fs';
         \n`,
         `\nimport { getContractInstance, getContractAddress, registerKey } from './common/contract.mjs';`,
-        `\nimport { storeCommitment, getCurrentWholeCommitment, getCommitmentsById, getAllCommitments, getInputCommitments, joinCommitments, markNullified,getnullifierMembershipWitness,getupdatedNullifierPaths,temporaryUpdateNullifier,updateNullifierTree,} from './common/commitment-storage.mjs';`,
+        `\nimport { storeCommitment, getCurrentWholeCommitment, getCommitmentsById, getAllCommitments, getInputCommitments, joinCommitments, markNullified,getnullifierMembershipWitness,getupdatedNullifierPaths,temporaryUpdateNullifier,updateNullifierTree} from './common/commitment-storage.mjs';`,
         `\nimport { generateProof } from './common/zokrates.mjs';`,
         `\nimport { getMembershipWitness, getRoot } from './common/timber.mjs';`,
         `\nimport Web3 from './common/web3.mjs';`,

diff --git a/src/codeGenerators/orchestration/files/toOrchestration.ts b/src/codeGenerators/orchestration/files/toOrchestration.ts
@@ -6,7 +6,7 @@ import { collectImportFiles, localFile } from '../../common.js'
 import OrchestrationBP from '../../../boilerplate/orchestration/javascript/raw/boilerplate-generator.js';
 import codeGenerator from '../nodejs/toOrchestration.js';
 import logger from '../../../utils/logger.js';
-import { StateVariableIndicator, FunctionDefinitionIndicator } from '../../../traverse/Indicator.js';
+
 
 
 /**
@@ -147,31 +147,6 @@ const prepareIntegrationApiServices = (node: any) => {
   let structparams;
     const paramName = fn.parameters.parameters.map((obj: any) => obj.name);
 
-
-    const parameters = fn.parameters.parameters;
-    const modifiedStateVariables = fn.parameters.modifiedStateVariables;
-
-    // Check if the function interacts with secret or public data
-    let interactsWithSecret = false;
-    let interactsWithPublic = false;
-
-    parameters.forEach(param => {
-      if (param.isSecret) {
-        interactsWithSecret = true;
-      } else {
-        interactsWithPublic = true;
-      }
-    });
-
-    modifiedStateVariables.forEach(stateVar => {
-      if (stateVar.isSecret) {
-        interactsWithSecret = true;
-      } else {
-        interactsWithPublic = true;
-      }
-    });
-
-
     fn.parameters.parameters.forEach(p => {
       if (p.typeName.isStruct) {
         structparams = `{ ${p.typeName.properties.map(prop => `${prop.name}: req.body.${p.name}.${prop.name}`)}}`;
@@ -191,7 +166,7 @@ const prepareIntegrationApiServices = (node: any) => {
       // Adding Return parameters
     let returnParams: string[] = [];
 
-      console.log(`${fn.name} interacts with secret data`);
+
       let returnParamsName = fn.returnParameters.parameters.filter((paramnode: any) => (paramnode.isSecret || paramnode.typeName.name === 'bool')).map(paramnode => (paramnode.name)) || []; // Adapt
       if(returnParamsName.length > 0){
       returnParamsName.forEach(param => {
@@ -203,14 +178,8 @@ const prepareIntegrationApiServices = (node: any) => {
          returnParams.push('bool');
       });
     }
-      // Handle functions that interact with public data
-    console.log(`${fn.name} interacts with public data`);
-    fnboilerplate = fnboilerplate.replace(/const { tx , encEvent, _RESPONSE_} = await FUNCTION_NAME\(FUNCTION_SIG\);/, 'const { tx } = await FUNCTION_NAME(FUNCTION_SIG);');
-    fnboilerplate = fnboilerplate.replace(/res.send\({tx, encEvent, _RESPONSE_}\);/, 'res.send({tx});');
-
-         //let returnParamsName = fn.returnParameters.parameters.filter((paramnode) => paramnode.isSecret).map((paramnode) => paramnode.name) || [];
-
-// to close if (fn.isSecret)
+
+
     // replace the signature with test inputs
     fnboilerplate = fnboilerplate.replace(/const FUNCTION_SIG/g, fnParam);
     fnboilerplate = fnboilerplate.replace(/,const/g, `const`);

diff --git a/src/transformers/visitors/toOrchestrationVisitor.ts b/src/transformers/visitors/toOrchestrationVisitor.ts
@@ -319,53 +319,7 @@ const visitor = {
           );
         }
         }
-      } /*else if (!scope.modifiesSecretState()) {
-        const contractName = `${parent.name}Shield`;
-        const fnName = path.getUniqueFunctionName();
-        node.fileName = fnName;
-
-        // After getting an appropriate Name , we build the node
-
-        const newNode = buildNode('File', {
-          fileName: fnName, // the name of this function
-          fileExtension: '.mjs',
-          nodes: [
-            buildNode('Imports'),
-            buildNode('FunctionDefinition', { name: node.name, contractName }),
-          ],
-        });
-
-
-        node._newASTPointer = newNode.nodes[1]; // eslint-disable-line prefer-destructuring
-        parent._newASTPointer.push(newNode);
-        for (const file of parent._newASTPointer) {
-          if (file.nodes?.[0].nodeType === 'IntegrationTestBoilerplate') {
-            file.nodes[0].functions.push(
-              buildNode('IntegrationTestFunction', {
-                name: fnName,
-                parameters: [],
-              }),
-            );
-          }
-        if (file.nodes?.[0].nodeType === 'IntegrationApiServicesBoilerplate') {
-          file.nodes[0].functions.push(
-            buildNode('IntegrationApiServiceFunction', {
-              name: fnName,
-              parameters: [],
-              returnParameters:[],
-            }),
-          );
-        }
-        if (file.nodes?.[0].nodeType === 'IntegrationApiRoutesBoilerplate') {
-          file.nodes[0].functions.push(
-            buildNode('IntegrationApiRoutesFunction', {
-              name: fnName,
-              parameters: [],
-            }),
-          );
-        }
-        } }*/
-
+      } 
       else {
         state.skipSubNodes = true;
       }

diff --git a/src/traverse/Binding.ts b/src/traverse/Binding.ts
@@ -136,7 +136,7 @@ export class Binding {
 export class VariableBinding extends Binding {
   isSecret: boolean;
   stateVariable: boolean;
-  isPublic: boolean;
+
 
   isModified: boolean;
   modificationCount: number = 0;