Deduct min steps to finish tx from total steps

0xPolygonHermez · Nov 28, 2022 · eaa0cac · eaa0cac
1 parent c965a39
commit eaa0cac
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 128 deletions.
diff --git a/main/constants.zkasm b/main/constants.zkasm
@@ -29,7 +29,7 @@ CONST %SSTORE_RESET_GAS = 2900
 CONST %SSTORE_CLEARS_SCHEDULE = 15000
 
 ; COUNTERS
-CONST %MAX_CNT_STEPS = 2**23
+CONST %MAX_CNT_STEPS = 2**23 - 200 ; 200 = min steps to finish tx
 
 CONST %MAX_CNT_ARITH = %MAX_CNT_STEPS / 32
 CONST %MAX_CNT_BINARY = %MAX_CNT_STEPS / 32

diff --git a/main/opcodes/arithmetic.zkasm b/main/opcodes/arithmetic.zkasm
@@ -11,7 +11,7 @@
 opADD:
     ; checks zk-counters
     %MAX_CNT_BINARY - CNT_BINARY - 1 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     ; check stack underflow
     SP - 2          :JMPN(stackUnderflow)
@@ -33,7 +33,7 @@ opADD:
 opMUL:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -52,7 +52,7 @@ opMUL:
 opSUB:
 
     %MAX_CNT_BINARY - CNT_BINARY - 1 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -67,7 +67,7 @@ opDIV:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 2 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -87,7 +87,7 @@ opSDIV:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 8 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -133,7 +133,7 @@ opMOD:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 2 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -153,7 +153,7 @@ opSMOD:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 8 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -197,7 +197,7 @@ opADDMOD:
 
     %MAX_CNT_ARITH - CNT_ARITH - 1 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 4 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 80 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 80 :JMPN(outOfCountersStep)
 
     GAS-8 => GAS    :JMPN(outOfGas)
 
@@ -255,7 +255,7 @@ opMULMOD:
 opEXP:
 
     %MAX_CNT_BINARY - CNT_BINARY - 5 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2              :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -272,7 +272,7 @@ opEXP:
 opSIGNEXTEND: ; following this impl https://github.com/ethereumjs/ethereumjs-monorepo/blob/master/packages/vm/src/evm/opcodes/functions.ts#L193
 
     %MAX_CNT_ARITH - CNT_ARITH - 6 :JMPN(outOfCountersArith)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 2          :JMPN(stackUnderflow)
     SP - 1 => SP

diff --git a/main/opcodes/block.zkasm b/main/opcodes/block.zkasm
@@ -4,7 +4,7 @@ opBLOCKHASH:
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 255 :JMPN(outOfCountersPoseidon)
     $ => A                                     :MLOAD(cntKeccakPreProcess)
     %MAX_CNT_KECCAK_F - CNT_KECCAK_F - A - 1   :JMPN(outOfCountersKeccak)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 1 => SP     :JMPN(stackUnderflow)
     GAS - 20 => GAS  :JMPN(outOfGas)
@@ -42,7 +42,7 @@ opBLOCKHASHzero:
 
 opCOINBASE:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(sequencerAddr)
     A               :MSTORE(SP++)
@@ -52,7 +52,7 @@ opCOINBASE:
 
 opTIMESTAMP:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(timestamp)
     A               :MSTORE(SP++)
@@ -62,7 +62,7 @@ opTIMESTAMP:
 
 opNUMBER:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     ; Get current tx count
     $ => D          :MLOAD(txCount)
@@ -73,7 +73,7 @@ opNUMBER:
 
 opDIFFICULTY:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     %BATCH_DIFFICULTY => A
     A               :MSTORE(SP++)
@@ -83,7 +83,7 @@ opDIFFICULTY:
 
 opGASLIMIT:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     %TX_GAS_LIMIT => A
     A               :MSTORE(SP++)
@@ -93,7 +93,7 @@ opGASLIMIT:
 
 opCHAINID:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(chainID)
     A               :MSTORE(SP++)
@@ -102,7 +102,7 @@ opCHAINID:
                     :JMP(readCode)
 opBASEFEE:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     0               :MSTORE(SP++)
     1024 - SP       :JMPN(stackOverflow)

diff --git a/main/opcodes/calldata-returndata-code.zkasm b/main/opcodes/calldata-returndata-code.zkasm
@@ -4,7 +4,7 @@ opCALLDATALOAD:
 
     %MAX_CNT_ARITH - CNT_ARITH - 64 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 66 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 1 => SP    :JMPN(stackUnderflow)
     $ => B          :MLOAD(SP)
@@ -52,7 +52,7 @@ CALLDATALOADreturn0:
 
 opCALLDATASIZE:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(isCreateContract)
     0 - A           :JMPN(opCALLDATASIZEdep)
@@ -75,7 +75,7 @@ opCALLDATACOPY:
     %MAX_CNT_ARITH - CNT_ARITH - 192 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 192 :JMPN(outOfCountersBinary)
     %MAX_CNT_MEM_ALIGN - CNT_MEM_ALIGN - 1 :JMPN(outOfCountersMemalign)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 3          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -102,7 +102,7 @@ opCALLDATACOPYinit:
     %MAX_CNT_ARITH - CNT_ARITH - 192 :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 192 :JMPN(outOfCountersBinary)
     %MAX_CNT_MEM_ALIGN - CNT_MEM_ALIGN - 1 :JMPN(outOfCountersMemalign)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 200 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 200 :JMPN(outOfCountersStep)
 
     C - 1           :JMPN(opCALLDATACOPYcheckLen)
     C - 32          :JMPN(opCALLDATACOPYfinal)
@@ -196,7 +196,7 @@ opCALLDATACOPYend:
 opCODESIZE:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 252 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(isCreateContract)
     0 - A           :JMPN(opCODESIZEdep)
@@ -236,7 +236,7 @@ opCODECOPY:
 
     ;Check counters
     %MAX_CNT_BINARY - CNT_BINARY - 32          :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     GAS - 3 => GAS  :JMPN(outOfGas)
     GAS - ${3*((E+31)/32)} => GAS    :JMPN(outOfGas)
@@ -262,7 +262,7 @@ opCODECOPY2:
 opCODECOPYinit:
     %MAX_CNT_BINARY - CNT_BINARY - 32          :JMPN(outOfCountersBinary)
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 510 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100                :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100                :JMPN(outOfCountersStep)
     %MAX_CNT_MEM_ALIGN - CNT_MEM_ALIGN  - 2    :JMPN(outOfCountersMemalign)
 
     $ => B          :MLOAD(remainingBytes)
@@ -308,7 +308,7 @@ readValueBytecode:
 opEXTCODESIZE:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 255 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 1 => SP    :JMPN(stackUnderflow)
     $ => A          :MLOAD(SP)
@@ -334,7 +334,7 @@ opEXTCODECOPY:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 510 :JMPN(outOfCountersPoseidon)
     %MAX_CNT_PADDING_PG - CNT_PADDING_PG - 11 :JMPN(outOfCountersPadding)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 4          :JMPN(stackUnderflow)
     SP - 1 => SP
@@ -351,7 +351,7 @@ opEXTCODECOPY:
 
     ;Check counters should be before than do all the operations! TODO
     %MAX_CNT_BINARY - CNT_BINARY - 32          :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100                :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100                :JMPN(outOfCountersStep)
     %MAX_CNT_MEM_ALIGN - CNT_MEM_ALIGN  - 2    :JMPN(outOfCountersMemalign)
 
 
@@ -408,7 +408,7 @@ opEXTCODECOPYCheckHash:
 ; TODO: it could be improved by computing how many 32 bytes slots are needed
 opEXTCODECOPYCheckHashLoop:
 
-        %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+        %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
         B - 1                                   :JMPN(opEXTCODECOPYCheckHashLoopEnd) ; finish reading bytecode
         1 => D
@@ -426,7 +426,7 @@ opEXTCODECOPYCheckHashEnd:
 
 opEXTCODECOPYinit:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     C - 1           :JMPN(readCode)
     C - 32          :JMPN(opEXTCODECOPYfinal)
@@ -448,7 +448,7 @@ opEXTCODECOPYfinal:
 opRETURNDATASIZE:
 
     %MAX_CNT_BINARY - CNT_BINARY - 1 :JMPN(outOfCountersBinary)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     ; Load ret data length from last ctx
     ; If no retDataCTX(0), retDataLength = 0
@@ -480,7 +480,7 @@ opRETURNDATACOPY:
     %MAX_CNT_ARITH - CNT_ARITH - 32            :JMPN(outOfCountersArith)
     %MAX_CNT_BINARY - CNT_BINARY - 32          :JMPN(outOfCountersBinary)
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 510 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 400 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 400 :JMPN(outOfCountersStep)
     %MAX_CNT_MEM_ALIGN - CNT_MEM_ALIGN  - 2    :JMPN(outOfCountersMemalign)
 
                     :CALL(saveMem)
@@ -521,7 +521,7 @@ opRETURNDATACOPY:
     GAS - A => GAS  :JMPN(outOfGas)
 
 opRETURNDATACOPYinit:
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     C - 1           :JMPN(readCode)
     C - 32          :JMPN(opRETURNDATACOPYfinal)
@@ -560,7 +560,7 @@ opRETURNDATACOPYEmpty:
 opEXTCODEHASH:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 255 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 1 => SP    :JMPN(stackUnderflow)
     $ => A          :MLOAD(SP)

diff --git a/main/opcodes/context-information.zkasm b/main/opcodes/context-information.zkasm
@@ -1,5 +1,5 @@
 opADDRESS:
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(isCreateContract)
     0 - A           :JMPN(opADDRESSdeploy)
@@ -18,7 +18,7 @@ opADDRESSend:
 opSELFBALANCE:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 255 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(storageAddr)
     0 => B,C        ; balance key smt
@@ -30,7 +30,7 @@ opSELFBALANCE:
 opBALANCE:
 
     %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - 252 :JMPN(outOfCountersPoseidon)
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     SP - 1 => SP    :JMPN(stackUnderflow)
     $ => A          :MLOAD(SP)
@@ -45,7 +45,7 @@ opBALANCE:
 
 opORIGIN:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(txSrcOriginAddr)
     A               :MSTORE(SP++)
@@ -55,7 +55,7 @@ opORIGIN:
 
 opCALLER:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(txSrcAddr)
     A               :MSTORE(SP++)
@@ -65,7 +65,7 @@ opCALLER:
 
 opCALLVALUE:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(txValue)
     A               :MSTORE(SP++)
@@ -75,7 +75,7 @@ opCALLVALUE:
 
 opGASPRICE:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     $ => A          :MLOAD(txGasPrice)
     A               :MSTORE(SP++)
@@ -84,7 +84,7 @@ opGASPRICE:
                     :JMP(readCode)
 opGAS:
 
-    %MAX_CNT_STEPS - MIN_STEPS_FINISH_TX - STEP - 100 :JMPN(outOfCountersStep)
+    %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
 
     GAS - 2 => GAS  :JMPN(outOfGas)
     GAS             :MSTORE(SP++)