fix: multiple incrementations for decrements in orchestration

EYBlockchain · Jul 8, 2024 · 1eda67f · 1eda67f
1 parent f2be420
commit 1eda67f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts
@@ -131,13 +131,15 @@ class BoilerplateGenerator {
               ${stateVarIds.join('\n')}
               \nlet ${stateName}_preimage = await getCommitmentsById(${stateName}_stateVarId);
               \n
+              ${structProperties.map(sp => `let ${stateName}_${sp}_newCommitmentValue = generalise(0);\n`).join('')}
             `];
           return [`
             \n\n// read preimage for decremented state
             \n${stateName}_newOwnerPublicKey = ${newOwnerStatment}
             ${stateVarIds.join('\n')}
             \nlet ${stateName}_preimage = await getCommitmentsById(${stateName}_stateVarId);
-            \n`  ];
+            \n
+            let ${stateName}_newCommitmentValue = generalise(0);`  ];
         case 'whole':
           switch (reinitialisedOnly) {
             case true:

diff --git a/src/codeGenerators/orchestration/nodejs/toOrchestration.ts b/src/codeGenerators/orchestration/nodejs/toOrchestration.ts
@@ -131,8 +131,16 @@ export default function codeGenerator(node: any, options: any = {}): any {
           increments = codeGenerator(node.expression.rightHandSide);
           return  `\n${privateStateName}_newCommitmentValue = generalise(parseInt(${privateStateName}_newCommitmentValue.integer, 10) + ${increments});\n`;
         }
+        if (node.expression.operator === '-='){
+          increments = codeGenerator(node.expression.rightHandSide);
+          return  `\n${privateStateName}_newCommitmentValue = generalise(parseInt(${privateStateName}_newCommitmentValue.integer, 10) + (${increments}));\n`;
+        }
         if (node.expression.operator === '='){
           increments = codeGenerator(node.expression.rightHandSide);
+          if (node.decrementsSecretState){
+            increments = increments.replace(new RegExp(`${privateStateName}.integer`, 'g'), `0`);
+            return `\n${privateStateName}_newCommitmentValue = generalise(parseInt(${privateStateName}_newCommitmentValue.integer, 10) - (${increments}));\n`;
+          } 
           increments = increments.replace(new RegExp(privateStateName, 'g'), `${privateStateName}_newCommitmentValue`);
           return  `\n${privateStateName}_newCommitmentValue = generalise(${increments});\n`;
         }

diff --git a/test/contracts/KnownUnknown.zol b/test/contracts/KnownUnknown.zol
@@ -22,7 +22,8 @@ contract Assign {
   }
 
   function remove( uint256 value ) public {
-    unknown b -= value +a;
+    unknown b = b - value +a;
+    unknown b = b - (value +a);
     unknown x.prop1 -= value + a;
     unknown x.prop2 -= value;
     unknown b -= value;