Merge pull request #380 from 0xPolygonHermez/feature/fix-73

Feature/fix 73
0xPolygonHermez · Apr 18, 2024 · e8f363e · e8f363e
2 parents 1541b87 + 7cd0a91
commit e8f363e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/main/process-change-l2-block-utils.zkasm b/main/process-change-l2-block-utils.zkasm
@@ -1,4 +1,5 @@
 ; Computes L1InfoTree leaf value computedL1InfoTreeData = keccak(gerL1InfoTree, blockHashL1InfoTree, timestampL1InfoTree)
+; @out label: computedL1InfoTreeData
 computeL1InfoTreeValue:
     %MAX_CNT_KECCAK_F - CNT_KECCAK_F - 1         :JMPN(outOfCountersKeccak)
 
@@ -30,6 +31,7 @@ computeNewCurrentL1InfoRootFromHistoric:
 
 ; compute "new" currentL1InfoRoot from computed merkle root, currentL1InfoTreeRoot = keccak(computedMerkleRoot, computedL1InfoTreeData)
 ; @in C: computed merkle root
+; @out label: currentL1InfoTreeRoot
 computeNewCurrentL1InfoRoot:
     %MAX_CNT_KECCAK_F - CNT_KECCAK_F - 1    :JMPN(outOfCountersKeccak)
     $ => E                                  :MLOAD(nextHashKId)

diff --git a/main/process-change-l2-block.zkasm b/main/process-change-l2-block.zkasm
@@ -52,7 +52,7 @@ continueProcessChangeL2Block:
     $                                   :MLOAD(isForced), JMPZ(verifyTimestampAndL1InfoRoot)
 
     ; forced batch
-    ;   - update timestamp only if currentTimestamp < limitTimestamp
+    ;   - update timestamp only if currentTimestamp < forcedTimestamp
     ;   - set blockHash to default
     $ => C                              :MLOAD(forcedBlockHashL1InfoTree)
     C                                   :MSTORE(blockHashL1InfoTree)
@@ -77,26 +77,29 @@ verifyTimestampAndL1InfoRoot:
     A - $ - 1                                           :F_MLOAD(currentL1InfoTreeIndex), JMPN(invalidL1InfoTreeIndex)
     ${getL1InfoGER(mem.indexL1InfoTree)}                :MSTORE(gerL1InfoTree)
     ${getL1InfoBlockHash(mem.indexL1InfoTree)}          :MSTORE(blockHashL1InfoTree)
-    ${getL1InfoMinTimestamp(mem.indexL1InfoTree)} => B  :MSTORE(timestampL1InfoTree)
-    ; Verify (currentTimestamp + deltaTimestamp) >= l1InfoRoot.minTimestamp
-    $ => A                                              :MLOAD(timestamp)
-    $                                                   :LT, JMPC(invalidChangeL2BlockMinTimestamp)
+    ${getL1InfoMinTimestamp(mem.indexL1InfoTree)}       :MSTORE(timestampL1InfoTree)
+
     ; Compute infoTreeData
-                                            :CALL(computeL1InfoTreeValue)
+                                            :CALL(computeL1InfoTreeValue) ; out: [@label: computedL1InfoTreeData]
     $                                       :MLOAD(currentL1InfoTreeIndex), JMPNZ(previousL1InfoTreeIndexIsNotZero)
     ; if previous L1 Info TreeIndex is zero, currentL1InfoTreeRoot = keccak(HistoricRoot, blockHashL1InfoTree)
                                             :CALL(computeNewCurrentL1InfoRootFromHistoric)
-    $ => A                                  :MLOAD(indexL1InfoTree)
-    ; Update currentL1InfoTreeIndex
-    A                                       :MSTORE(currentL1InfoTreeIndex), JMP(initSetGERL1InfoTree)
+                                            :JMP(updateCurrentL1InfoTreeIndex)
 
 previousL1InfoTreeIndexIsNotZero:
+    ; if previous L1 Info TreeIndex is NOT zero, currentL1InfoTreeRoot = keccak(computedMerkleRoot, blockHashL1InfoTree)
                                             :CALL(computeMerkleProof)  ; out: [C: computed merkle root]
     ; Compute newL1InfoTreeRoot
-                                            :CALL(computeNewCurrentL1InfoRoot)
+                                            :CALL(computeNewCurrentL1InfoRoot) ; in: [C: computed merkle root], out: [@label: currentL1InfoTreeRoot]
+updateCurrentL1InfoTreeIndex:
     ; Update currentL1InfoTreeIndex
     $ => A                                  :MLOAD(indexL1InfoTree)
-    A                                       :MSTORE(currentL1InfoTreeIndex), JMP(initSetGERL1InfoTree)
+    A                                       :MSTORE(currentL1InfoTreeIndex)
+    ; Verify (currentTimestamp + deltaTimestamp) >= l1InfoRoot.minTimestamp
+    ; This verification is done after updating the currentL1InfoTreeIndex and the currentL1InfoTreeRoot to correctly set batch outputs at execution finalization
+    $ => A                                  :MLOAD(timestamp)
+    $ => B                                  :MLOAD(timestampL1InfoTree)
+    $                                       :LT, JMPC(invalidChangeL2BlockMinTimestamp, initSetGERL1InfoTree)
 
 setNewTimestamp:
     ; Set forcedTimestamp (now new Timestamp) from forced batch data

diff --git a/package.json b/package.json
@@ -43,9 +43,9 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v7.0.0-rc.1-fork.10",
-    "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#feature/fix-batchHashData",
-    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#feature/fix-test",
+    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#develop-feijoa",
+    "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#develop-feijoa",
+    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#develop-feijoa",
     "chai": "^4.3.6",
     "chalk": "^3.0.0",
     "eslint": "^8.25.0",