Merge pull request #245 from 0xPolygonHermez/develop

Develop

.eslintrc.js

@@ -3,8 +3,10 @@ module.exports = {
         'mocha',
     ],
     env: {
+        es2020: true,
         node: true,
         mocha: true,
+        'es2020': true,
     },
     extends: 'airbnb-base',
     rules: {
@@ -24,7 +26,6 @@ module.exports = {
         'no-console': [2, { allow: ['warn', 'error'] }],
         '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/workflows/main.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - develop
+      - develop-feijoa
   push:
     branches:
       - main
@@ -30,8 +31,8 @@ jobs:
       - name: Clone repos
         run: |
           cd ..
-          git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git --branch v3.0.0-rc.1-fork.6
-          cd zkevm-testvectors/tools/ethereum-tests
+          git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git --branch develop
+          cd zkevm-testvectors/tools-inputs/tools-eth
           git clone https://github.com/0xPolygonHermez/ethereum-tests tests
           cd tests
           git checkout test-vectors

.gitignore

@@ -8,13 +8,14 @@ logs-trace
 logs-full-trace
 logs-verbose
 logs-stats
-package-lock.json
 cache-main-pil.json
 testvectors/commit.bin
 testvectors/constants.bin
 tmp
 pil-config.json
 parallel-tests
 verbose-config.json
+tracer-options.json
 *.stats
+main.pil.json
 tools/full-tracer-tests/ft-traces/