Merge pull request #305 from 0xPolygonHermez/develop

Develop

.eslintrc.js

@@ -21,10 +21,9 @@ module.exports = {
         'class-methods-use-this': [0],
         'no-bitwise': [0],
         'no-param-reassign': 'off',
-        'no-console': [2, { allow: ['warn', 'error'] }],
+        'no-console': 'off',
         'import/prefer-default-export': [0],
         'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
-        'multiline-comment-style': 'error',
         'no-await-in-loop': 'off',
         'newline-before-return': 'error',
     },

.github/CODEOWNERS

@@ -0,0 +1,14 @@
+# global owner
+*                   @krlosMata @laisolizq @invocamanman @ignasirv
+
+# ecrecover owner
+/main/ecrecover     @zkronos73 @krlosMata
+
+# counters folder owner
+/counters/          @ignasirv @krlosMata
+
+# tests owner
+/test/              @laisolizq @krlosMata
+
+# tools owner
+/tools/             @laisolizq @krlosMata

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,38 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+assignees: [krlosMata, laisolizq, invocamanman, ignasirv]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Fill in all necessary information to report a bug
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version are you using ?
+      placeholder: 'ex: v1.0.0'
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Explain the bug found and the expected result
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Please share detailed information about ho to reproduce the bug
+    validations:
+        required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log
+      description: Please copy and paste any relevant log output
+      render: shell

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,26 @@
+name: Feature Request
+description: File a bug report
+title: "[Feature]: "
+labels: ["feature"]
+assignees:
+  - krlosMata
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Fill in all necessary information to request a feature
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version the features should be added ?
+      placeholder: 'ex: v1.0.0'
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Explain the feature
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,26 @@
+name: Question
+description: Submit a question
+title: "[Question]: "
+labels: ["question"]
+assignees:
+  - krlosMata
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Fill in all necessary information to submit a question
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version the question is refering to ?
+      placeholder: 'ex: v1.0.0'
+    validations:
+      required: true
+  - type: textarea
+    id: question
+    attributes:
+      label: Description
+      description: Explain the question
+    validations:
+      required: true

.github/workflows/main.yaml

@@ -27,6 +27,9 @@ jobs:
       - name: run counters tests
         run: |
           npm run test:counters
+      - name: run zkasm tests
+        run: |
+          npm run test:zkasm
       - name: Generate tests
         run: |
           npm run test:gen

.gitignore

@@ -73,3 +73,5 @@ build
 # testvectors files
 tools/parallel-tests
 
+
+.vscode/launch.json

counters/countersConstants.zkasm

@@ -70,14 +70,7 @@ CONST %ABS_CNT_KECCAK_F = 0
 CONST %ABS_CNT_MEM_ALIGN = 0
 CONST %ABS_CNT_PADDING_PG = 0
 CONST %ABS_CNT_POSEIDON_G = 0
-; copySP
-CONST %COPYSP_STEP = 20 + %MLOADX_STEP
-CONST %COPYSP_CNT_BINARY = 0 + %MLOADX_CNT_BINARY
-CONST %COPYSP_CNT_ARITH = 0 + %MLOADX_CNT_ARITH
-CONST %COPYSP_CNT_KECCAK_F = 0 + %MLOADX_CNT_KECCAK_F
-CONST %COPYSP_CNT_MEM_ALIGN = 0 + %MLOADX_CNT_MEM_ALIGN
-CONST %COPYSP_CNT_PADDING_PG = 0 + %MLOADX_CNT_PADDING_PG
-CONST %COPYSP_CNT_POSEIDON_G = 0 + %MLOADX_CNT_POSEIDON_G
+
 ; mulARITH
 CONST %MULARITH_STEP = 50
 CONST %MULARITH_CNT_BINARY = 1
@@ -208,7 +201,7 @@ CONST %OPBLOCKHASH_CNT_PADDING_PG = 0
 CONST %OPBLOCKHASH_CNT_POSEIDON_G = 2
 ; opCALLDATALOAD
 CONST %OPCALLDATALOAD_STEP = 100 + %SHLARITH_STEP + %SHRARITH_STEP + %DIVARITH_STEP
-CONST %OPCALLDATALOAD_CNT_BINARY = 2
+CONST %OPCALLDATALOAD_CNT_BINARY = 3
 CONST %OPCALLDATALOAD_CNT_ARITH = 0
 CONST %OPCALLDATALOAD_CNT_KECCAK_F = 0 + %SHLARITH_CNT_KECCAK_F + %SHRARITH_CNT_KECCAK_F + %DIVARITH_CNT_KECCAK_F
 CONST %OPCALLDATALOAD_CNT_MEM_ALIGN = 1
@@ -248,34 +241,34 @@ CONST %OPEXTCODECOPY_CNT_PADDING_PG = 0
 CONST %OPEXTCODECOPY_CNT_POSEIDON_G = 8
 ; opCREATE - COMPLEX - hardcoded values at test
 CONST %OPCREATE_STEP = 400
-CONST %OPCREATE_CNT_BINARY = 23
-CONST %OPCREATE_CNT_ARITH = 4
+CONST %OPCREATE_CNT_BINARY = 16
+CONST %OPCREATE_CNT_ARITH = 1
 CONST %OPCREATE_CNT_KECCAK_F = 0
-CONST %OPCREATE_CNT_MEM_ALIGN = 2
+CONST %OPCREATE_CNT_MEM_ALIGN = 0
 CONST %OPCREATE_CNT_PADDING_PG = 0
 CONST %OPCREATE_CNT_POSEIDON_G = 23
 ; opCREATE2 - COMPLEX - hardcoded values at test
 CONST %OPCREATE2_STEP = 500
-CONST %OPCREATE2_CNT_BINARY = 29
-CONST %OPCREATE2_CNT_ARITH = 5
+CONST %OPCREATE2_CNT_BINARY = 22
+CONST %OPCREATE2_CNT_ARITH = 2
 CONST %OPCREATE2_CNT_KECCAK_F = 0
-CONST %OPCREATE2_CNT_MEM_ALIGN = 2
+CONST %OPCREATE2_CNT_MEM_ALIGN = 0
 CONST %OPCREATE2_CNT_PADDING_PG = 0
 CONST %OPCREATE2_CNT_POSEIDON_G = 27
 ; opCALL - COMPLEX - hardcoded values at test
 CONST %OPCALL_STEP = 600
-CONST %OPCALL_CNT_BINARY = 34
-CONST %OPCALL_CNT_ARITH = 6
+CONST %OPCALL_CNT_BINARY = 27
+CONST %OPCALL_CNT_ARITH = 3
 CONST %OPCALL_CNT_KECCAK_F = 0
-CONST %OPCALL_CNT_MEM_ALIGN = 2
+CONST %OPCALL_CNT_MEM_ALIGN = 0
 CONST %OPCALL_CNT_PADDING_PG = 0
 CONST %OPCALL_CNT_POSEIDON_G = 14
 ; opCALLCODE - COMPLEX - hardcoded values at test
 CONST %OPCALLCODE_STEP = 600
-CONST %OPCALLCODE_CNT_BINARY = 33
-CONST %OPCALLCODE_CNT_ARITH = 6
+CONST %OPCALLCODE_CNT_BINARY = 26
+CONST %OPCALLCODE_CNT_ARITH = 3
 CONST %OPCALLCODE_CNT_KECCAK_F = 0
-CONST %OPCALLCODE_CNT_MEM_ALIGN = 2
+CONST %OPCALLCODE_CNT_MEM_ALIGN = 0
 CONST %OPCALLCODE_CNT_PADDING_PG = 0
 CONST %OPCALLCODE_CNT_POSEIDON_G = 10
 ; opRETURN - COMPLEX - hardcoded values at test
@@ -296,18 +289,18 @@ CONST %OPREVERT_CNT_PADDING_PG = 0
 CONST %OPREVERT_CNT_POSEIDON_G = 0
 ; opDELEGATECALL - COMPLEX - hardcoded values at test
 CONST %OPDELEGATECALL_STEP = 600
-CONST %OPDELEGATECALL_CNT_BINARY = 30
-CONST %OPDELEGATECALL_CNT_ARITH = 6
+CONST %OPDELEGATECALL_CNT_BINARY = 23
+CONST %OPDELEGATECALL_CNT_ARITH = 3
 CONST %OPDELEGATECALL_CNT_KECCAK_F = 0
-CONST %OPDELEGATECALL_CNT_MEM_ALIGN = 2
+CONST %OPDELEGATECALL_CNT_MEM_ALIGN = 0
 CONST %OPDELEGATECALL_CNT_PADDING_PG = 0
 CONST %OPDELEGATECALL_CNT_POSEIDON_G = 6
 ; opSTATICCALL - COMPLEX - hardcoded values at test
 CONST %OPSTATICCALL_STEP = 600
-CONST %OPSTATICCALL_CNT_BINARY = 30
-CONST %OPSTATICCALL_CNT_ARITH = 6
+CONST %OPSTATICCALL_CNT_BINARY = 23
+CONST %OPSTATICCALL_CNT_ARITH = 3
 CONST %OPSTATICCALL_CNT_KECCAK_F = 0
-CONST %OPSTATICCALL_CNT_MEM_ALIGN = 2
+CONST %OPSTATICCALL_CNT_MEM_ALIGN = 0
 CONST %OPSTATICCALL_CNT_PADDING_PG = 0
 CONST %OPSTATICCALL_CNT_POSEIDON_G = 6
 ; opSHA3 - COMPLEX - hardcoded values at test

main/constants.zkasm

@@ -1,15 +1,16 @@
 ; ZK_EVM
 CONSTL %ADDRESS_GLOBAL_EXIT_ROOT_MANAGER_L2 = 0xa40D5f56745a118D0906a34E69aeC8C0Db1cB8fAn
 CONSTL %ADDRESS_SYSTEM = 0x000000000000000000000000000000005ca1ab1en
-CONST %CALLDATA_OFFSET = 1024
+CONST %MAX_STACK_SIZE = 1024
 CONST %BATCH_DIFFICULTY = 0
 CONST %TX_GAS_LIMIT = 30000000
 CONST %GLOBAL_EXIT_ROOT_STORAGE_POS = 0
 CONST %LOCAL_EXIT_ROOT_STORAGE_POS = 1
 CONST %LAST_TX_STORAGE_POS = 0
 CONST %STATE_ROOT_STORAGE_POS = 1
 CONST %MAX_MEM_EXPANSION_BYTES = 0x3fffe0
-CONST %FORK_ID = 4
+CONST %FORK_ID = 5
+CONST %CALLDATA_RESERVED_CTX = 1
 
 ; RLP
 CONST %MIN_VALUE_SHORT = 128

main/ecrecover/ecrecover.zkasm

@@ -72,7 +72,7 @@ ecrecover_store_args:
         0n => A
         $           :EQ,JMPC(ecrecover_s_is_zero)
 
-        ; r and s in [1, FNEC-1]
+        ; compute r inverse
         $ => A      :MLOAD(ecrecover_r),CALL(invFnEc)
         B           :MSTORE(ecrecover_r_inv)