Merge pull request #306 from EYBlockchain/lydia/revert

Lydia/revert

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

@@ -889,13 +889,14 @@ export const OrchestrationCodeBoilerPlate: any = (node: any) => {
             lines.push(`${input.name}.all.integer`);
           } else if(input.isBool) {
             lines.push(`parseInt(${input.name}.integer, 10)`);
+          } else if(input.isAddress) {
+            lines.push(`${input.name}.hex(20)`);
           }
           else {
             lines.push(`${input}.integer`);
           }           
         });
       }
-      returnInputs = returnInputs.concat(lines);
 
       if(node.returnInputs[0]) {
         node.returnInputs.forEach((input: any) => { 
@@ -975,13 +976,26 @@ export const OrchestrationCodeBoilerPlate: any = (node: any) => {
 
 
       case 'SendPublicTransaction':  
-      node.publicInputsString = node.publicInputs.map(input =>
-        (typeof input === 'object' && !Array.isArray(input)) ? JSON.stringify(input) : input
-      ).join(',');
+      if (node.publicInputs[0]) {
+        node.publicInputs.forEach((input: any) => {
+          if (input.properties) {
+            lines.push(`[${input.properties.map(p => p.type === 'bool' ? `(${input.name}${input.isConstantArray ? '.all' : ''}.${p.name}.integer === "1")` : `${input.name}${input.isConstantArray ? '.all' : ''}.${p.name}.integer`).join(',')}]`);
+          } else if (input.isConstantArray) {
+            lines.push(`${input.name}.all.integer`);
+          } else if(input.isBool) {
+            lines.push(`parseInt(${input.name}.integer, 10)`);
+          } else if(input.isAddress) {
+            lines.push(`${input.name}.hex(20)`);
+          }
+          else {
+            lines.push(`${input}.integer`);
+          }           
+        });
+      }
       return {
         statements: [
           `\n\n// Send transaction to the blockchain:
-           \nconst txData = await instance.methods.${node.functionName}(${node.publicInputsString}).encodeABI();
+           \nconst txData = await instance.methods.${node.functionName}(${lines}).encodeABI();
           \nlet txParams = {
             from: config.web3.options.defaultAccount,
             to: contractAddr,

src/codeGenerators/circuit/zokrates/toCircuit.ts

@@ -251,7 +251,7 @@ function codeGenerator(node: any) {
         if(node.condition.leftExpression.nodeType == 'Identifier')
         node.condition.leftExpression.name = node.condition.leftExpression.name.replace('_temp','');
       initialStatements+= `
-      assert(${codeGenerator(node.condition)})`;
+      assert(!(${codeGenerator(node.condition)}))`;
       return initialStatements;
       }
       // we use our list of condition vars to init temp variables. 

src/codeGenerators/orchestration/nodejs/toOrchestration.ts

@@ -252,6 +252,16 @@ export default function codeGenerator(node: any, options: any = {}): any {
         "Require statement not satisfied: ${node.message[0].value}"
       );}\n`;
 
+    case 'RevertStatement':
+      if (!node.message){
+        return `throw new Error(
+          "Revert statement."
+        );\n`;
+      }
+      return `throw new Error(
+        "Reverted due to the following: ${node.message}"
+      );\n`;
+
     case 'Folder':
     case 'File':
     case 'EditableCommitmentCommonFilesBoilerplate':

src/transformers/visitors/toOrchestrationVisitor.ts

@@ -511,6 +511,7 @@ const visitor = {
           properties?: { name: string; type: string }[];
           isConstantArray?: boolean;
           isBool?: boolean;
+          isAddress?: boolean;
         }
 
         const sendPublicTransactionNode = buildNode('SendPublicTransaction', {
@@ -522,7 +523,7 @@ const visitor = {
 
         node.parameters.parameters.forEach((para: { isSecret: any; typeName: { name: string; }; name: any; _newASTPointer: { typeName: { properties: any[]; }; }; }) => {
           if (!para.isSecret) {
-            if (path.isStructDeclaration(para) || path.isConstantArray(para) || (para.typeName && para.typeName.name === 'bool')) {
+            if (path.isStructDeclaration(para) || path.isConstantArray(para) || (para.typeName && para.typeName.name === 'bool') || (para.typeName && para.typeName.name === 'address')) {
               let newParam: PublicParam = { name: para.name };
               if (path.isStructDeclaration(para)) {
                 newParam.properties = para._newASTPointer.typeName.properties.map(p => ({ "name": p.name, "type": p.type }));
@@ -532,6 +533,9 @@ const visitor = {
               }
               if (para.typeName?.name === 'bool') {
                 newParam.isBool = true;
+              } 
+              if (para.typeName?.name === 'address') {
+                newParam.isAddress = true;
               }
               sendPublicTransactionNode.publicInputs.push(newParam);
             } else {
@@ -866,12 +870,13 @@ const visitor = {
         // this adds other values we need in the tx
         for (const param of node.parameters.parameters) {
           if (!param.isSecret) {
-            if (path.isStructDeclaration(param) || path.isConstantArray(param)  ||( param.typeName && param.typeName.name === 'bool')) {
+            if (path.isStructDeclaration(param) || path.isConstantArray(param)  ||( param.typeName && param.typeName.name === 'bool') || ( param.typeName && param.typeName.name === 'address')) {
               let newParam: any = {};
               newParam.name = param.name;
               if (path.isStructDeclaration(param)) newParam.properties = param._newASTPointer.typeName.properties.map(p => ({"name" : p.name, "type" : p.type }));
               if (path.isConstantArray(param)) newParam.isConstantArray = true;
               if (param.typeName?.name === 'bool') newParam.isBool = true;
+              if (param.typeName?.name === 'address') newParam.isAddress = true;
               newNodes.sendTransactionNode.publicInputs.push(newParam);
             } else newNodes.sendTransactionNode.publicInputs.push(param.name);
           }
@@ -1801,6 +1806,15 @@ const visitor = {
         state.skipSubNodes = true;
         return;
       }
+      if (node.expression?.name === 'revert') {
+        const newNode = buildNode('RevertStatement', {
+        });
+        parent._newASTPointer[path.containerName] = newNode;
+        if (node.arguments[0]) newNode.message = node.arguments[0].value;
+        parent._newASTPointer.interactsWithSecret = path.getAncestorOfType('IfStatement').node._newASTPointer.interactsWithSecret;
+        state.skipSubNodes = true;
+        return;
+      }
       if (node.kind !== 'typeConversion') {
         state.skipSubNodes = true;
         return;

src/types/orchestration-types.ts

@@ -266,6 +266,12 @@ export default function buildNode(nodeType: string, fields: any = {}): any {
         message: [],
       };
     }
+    case 'RevertStatement': {
+      const {} = fields;
+      return {
+        nodeType,
+      };
+    }
     case 'InitialisePreimage':
     case 'InitialiseKeys':
     case 'ReadPreimage':

test/contracts/revert.zol

@@ -6,17 +6,50 @@ contract MyContract {
 
     secret uint256 private a;
     secret address private admin;
+    address private pubAdmin;
 
 
     constructor() {
       admin = msg.sender;
+      pubAdmin = msg.sender;
     }
 
-    function setAdmin(secret address newAdmin) public {
-      if(msg.sender == admin) {
-      revert(" revert ");
+    function setSecretAdmin(secret address newAdmin, uint256 value) public {
+      if(msg.sender != admin) {
+      revert("the msg sender is not admin ");
       }
       admin = newAdmin;
+      a+= value;
+    }
+
+    function setSecretAdmin1(secret address newAdmin) public {
+      if(msg.sender != admin) {
+      revert();
+      }
+      admin = newAdmin;
+      a+= 1;
+    }
+
+    function setPublicAdmin(address newAdmin) public {
+      if(msg.sender != pubAdmin) {
+      revert("the msg sender is not admin ");
+      }
+      pubAdmin = newAdmin;
       a+= 1;
     }
+
+    function setPublicAdmin1(address newAdmin) public {
+      if(msg.sender != pubAdmin) {
+      revert();
+      }
+      pubAdmin = newAdmin;
+      a+= 1;
+    }
+
+    function setPublicAdmin2(address newAdmin) public {
+      if(msg.sender != pubAdmin) {
+      revert();
+      }
+      pubAdmin = newAdmin;
+    }
 }