Merge pull request #111 from 0xPolygonHermez/feature/fix-precompiled-…

…ecrecover fix precompiled ecrecover
0xPolygonHermez · Aug 5, 2022 · dc5623a · dc5623a
2 parents b3034f7 + 4be6478
commit dc5623a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/main/opcodes.zkasm b/main/opcodes.zkasm
@@ -5,7 +5,7 @@ opSTOP:
     B - 1           :JMPN(handleGas)
     $ => A          :MLOAD(gasRefund)
     $ => C          :MLOAD(isCreate)
-    1 => D 
+    1 => D
     C - 1           :JMPN(opSTOPend)
     $ => D          :MLOAD(createContractAddress)
 
@@ -1023,11 +1023,11 @@ opRETURNDATASIZE:
     $ => B          :MLOAD(retDataCTX)
     0 => A
     $               :EQ, JMPC(endOpRETURNDATASIZE)
-    B => CTX        
+    B => CTX
     $ => A          :MLOAD(retDataLength)
     ; Restore current context
     $ => CTX        :MLOAD(currentCTX)
-                    
+
 endOpRETURNDATASIZE:
     A               :MSTORE(SP++)
     1024 - SP       :JMPN(stackOverflow)
@@ -1255,7 +1255,7 @@ opCHAINID:
                     :JMP(readCode)
 
 opSELFBALANCE:
-    
+
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 255 :JMPN(outOfCounters)
 
     $ => A          :MLOAD(storageAddr)
@@ -1290,7 +1290,7 @@ opMLOAD:
                     :JMP(readCode)
 
 ;MSTORE 32 bytes
-opMSTORE:                                       
+opMSTORE:
 
     %MAX_CNT_ARITH - CNT_ARITH - 32 :JMPN(outOfCounters)
     %MAX_CNT_BINARY - CNT_BINARY - 32 :JMPN(outOfCounters)
@@ -2532,7 +2532,7 @@ opCALLCODE2:
     C               :MSTORE(lastMemLength)
     ; Mem expansion gas cost call args
                     :CALL(saveMem)
-    
+
     ; Store byte offset in the memory in bytes, where to store the return data of the sub context.
     $ => B          :MLOAD(SP--)
     B               :MSTORE(lastMemOffset)
@@ -2780,7 +2780,7 @@ opDELEGATECALL:
     SR              :MSTORE(initSR)
     $ => A          :MLOAD(addrCall)
     A               :MSTORE(txDestAddr)
-    
+
     B               :MSTORE(retCallOffset)
     D               :MSTORE(retCallLength)
 
@@ -2889,7 +2889,7 @@ opSTATICCALL:
     A               :MSTORE(lastMemOffset)
 
     $ => B          :MLOAD(SP--)
-    B               :MSTORE(argsLengthCall)  
+    B               :MSTORE(argsLengthCall)
     B               :MSTORE(lastMemLength)
 
     ;Check counters
@@ -3017,7 +3017,7 @@ opREVERTend:
 opSELFDESTRUCT:
 
     ;Check counters
-    %MAX_CNT_BINARY - CNT_BINARY - 10 :JMPN(outOfCounters)  
+    %MAX_CNT_BINARY - CNT_BINARY - 10 :JMPN(outOfCounters)
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 2040 :JMPN(outOfCounters)
 
     $ => A              :MLOAD(isStaticCall)
@@ -3084,7 +3084,7 @@ opSELFDESTRUCT2:
     $                       :EQ,JMPC(handleGas)
     $ => B                  :MLOAD(gasRefund)
     $ => C                  :MLOAD(isCreate)
-    1 => D 
+    1 => D
     C - 1                   :JMPN(opSELFDESTRUCTCend)
     $ => D                  :MLOAD(createContractAddress)
 
@@ -3107,5 +3107,5 @@ opINVALID:
     ; Remaining gas is consumed
     0 => GAS
     ; if main context, halt execution
-    $ => B          :MLOAD(originCTX)      
+    $ => B          :MLOAD(originCTX)
                     :JMP(invalidProcess)
diff --git a/main/precompiled/pre-ecrecover.zkasm b/main/precompiled/pre-ecrecover.zkasm
@@ -30,15 +30,15 @@ funcECRECOVER:
     ; prepare return data
     $ => E                              :MLOAD(retCallOffset)
     ; $ => C                            :MLOAD(retCallLength) ; always 32
-    $ => A                              :MLOAD(originCTX)
-    A - 1                               :JMPN(handleGas)
-    $ => CTX                            :MLOAD(originCTX)
+    $ => C                              :MLOAD(originCTX)
+    C - 1                               :JMPN(handleGas)
+    C => CTX
     A                                   :MSTORE(bytesToStore)
                                         :CALL(MSTORE32)
                                         :JMP(preEnd)
 
 endECRECOVER:
     $ => A                              :MLOAD(originCTX)
     A - 1                               :JMPN(handleGas)
-    $ => CTX                            :MLOAD(originCTX)
+    A => CTX
                                         :JMP(preEnd)
diff --git a/main/process-tx.zkasm b/main/process-tx.zkasm
@@ -325,7 +325,7 @@ readDeployBytecode:
         $ => B                          :MLOAD(isCreate)
         0 - B                           :JMPN(readDeployBytecodeCreate)
         $ => B                          :MLOAD(txCalldataLen)
-        B - PC - 1                      :JMPN(defaultOpCode) 
+        B - PC - 1                      :JMPN(defaultOpCode)
         $ => HASHPOS                    :MLOAD(dataStarts)
         HASHPOS + PC => HASHPOS
         $ => E                          :MLOAD(batchHashDataId)
@@ -337,8 +337,8 @@ readDeployBytecode:
 readDeployBytecodeCreate:
         $ => CTX                        :MLOAD(originCTX)
         $ => E                          :MLOAD(argsLengthCall)
-        E - PC - 1                      :JMPN(readDeployBytecodeCreateDefault) 
-        
+        E - PC - 1                      :JMPN(readDeployBytecodeCreateDefault)
+
         $ => E                          :MLOAD(argsOffsetCall)
         E + PC => E
         1 => C
@@ -517,4 +517,4 @@ invalidTx:
 
 defaultOpCode:
         ${eventLog(onOpcode(0))}
-                                        :JMP(opSTOP) 
+                                        :JMP(opSTOP)
diff --git a/main/utils.zkasm b/main/utils.zkasm
@@ -458,7 +458,7 @@ zeroDiv:
     zkPC+1 => RR    :JMP(loadTmp)
     $ => RR         :MLOAD(tmpZkPC)
                     :JMP(RR)
-                    
+
 divisorSmallerDiv:
     0               :MSTORE(arithRes1)
     E               :MSTORE(arithRes2)
@@ -621,11 +621,19 @@ stackOverflow:
     ${eventLog(onError, overflow)}
                     :JMP(handleError)
 invalidDeploy:
+<<<<<<< HEAD
     ${eventLog(onError, invalid)}
                     :JMP(handleError)    
 invalidStaticTx:
     ${eventLog(onError, invalid)}
                     :JMP(handleInvalidStatic)           
+=======
+${eventLog(onError, invalid)}
+                    :JMP(handleError)
+invalidStaticTx:
+${eventLog(onError, invalid)}
+                    :JMP(handleInvalidStatic)
+>>>>>>> review changes
 handleError:
     ;revert all state changes
     ;initSR --> balance = balance - gas, nonce + 1