fork6 nodev0.4.1

.github/CODEOWNERS

@@ -1,12 +1,19 @@
-*.md                    @arnaubennassar
-aggregator/             @Mikelle @KonradIT
-cmd/                    @tclemos
-db/                     @Mikelle @tclemos
-docs/                   @arnaubennassar
-etherman/               @ARR552 @cool-develope
-jsonrpc/                @tclemos @KonradIT
-pool/                   @Mikelle @tclemos @KonradIT
-sequencer/              @Mikelle @ToniRamirezM @KonradIT
+*.md                    @agnusmor
+aggregator/             @agnusmor
+ci/                     @agnusmor @tclemos @ToniRamirezM @ARR552
+cmd/                    @tclemos @ToniRamirezM @ARR552
+config/                 @agnusmor @tclemos @ToniRamirezM @ARR552
+db/                     @tclemos @ToniRamirezM @ARR552
+docs/                   @agnusmor @joanestebanr
+etherman/               @ARR552 @joanestebanr
+ethtxmanager/           @tclemos
+gasprice/               @ARR552
+jsonrpc/                @tclemos
+merkletree/             @ToniRamirezM
+pool/                   @tclemos
+proto/                  @ToniRamirezM
+sequencer/              @ToniRamirezM @dpunish3r @agnusmor
+sequencesender/         @ToniRamirezM @dpunish3r @agnusmor
 state/                  @ToniRamirezM @tclemos
-synchronizer/           @ARR552 @cool-develope
+synchronizer/           @ARR552 @joanestebanr
 test/                   @tclemos

.github/pull_request_template.md

@@ -18,5 +18,5 @@ Codeowner reviewers:
 
 <!-- Codeowners should review only the part of code that they own, they're added automatically as reviewers and it's good to let them know that they shouldn't do a full review -->
 
-- @Alice
-- @Bob
+- @-Alice
+- @-Bob

.github/workflows/jsonschema.yml

@@ -14,7 +14,7 @@ jobs:
   json-schema:
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:
@@ -32,11 +32,13 @@ jobs:
       env:
         GOARCH: ${{ matrix.goarch }}
 
-    - uses: actions/setup-python@v1
-    - uses: BSFishy/pip-action@v1
+    - uses: actions/setup-python@v4
       with:
-        packages: |
-          json-schema-for-humans
+        python-version: '3.10'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install json-schema-for-humans
 
     - name: Check if JSON schema and generated doc is up to date
       run: |

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Lint

.github/workflows/push-docker-develop.yml

@@ -11,20 +11,20 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
           push: true

.github/workflows/push-docker-tagged.yml

@@ -11,20 +11,20 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/release.yml

@@ -3,8 +3,7 @@ name: release
 on:
   push:
     tags:
-    - 'v[0-9]+.[0-9]+.[0-9]' # this action will only run on tags that follow semver
-
+    - 'v[0-9]+.[0-9]+.[0-9]+' # this action will only run on tags that follow semver
 jobs:
   releaser:
     runs-on: ubuntu-latest
@@ -17,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Get packr
         run: go install github.com/gobuffalo/packr/v2/[email protected]
@@ -41,6 +40,7 @@ jobs:
           mkdir -p testnet/db/scripts
           cp config/environments/testnet/* testnet/config/environments/testnet
           cp docker-compose.yml testnet
+          sed -i 's/\/config\/environments\/${ZKEVM_NETWORK}/\/config\/environments\/testnet/g' testnet/docker-compose.yml
           cp db/scripts/init_prover_db.sql testnet/db/scripts
           mv testnet/config/environments/testnet/example.env testnet
           sed -i -e "s/image: zkevm-node/image: hermeznetwork\/zkevm-node:$GIT_TAG_NAME/g" testnet/docker-compose.yml
@@ -50,6 +50,7 @@ jobs:
           mkdir -p mainnet/db/scripts
           cp config/environments/mainnet/* mainnet/config/environments/mainnet
           cp docker-compose.yml mainnet
+          sed -i 's/\/config\/environments\/${ZKEVM_NETWORK}/\/config\/environments\/mainnet/g' mainnet/docker-compose.yml
           cp db/scripts/init_prover_db.sql mainnet/db/scripts
           mv mainnet/config/environments/mainnet/example.env mainnet
           sed -i -e "s/image: zkevm-node/image: hermeznetwork\/zkevm-node:$GIT_TAG_NAME/g" mainnet/docker-compose.yml

.github/workflows/sonarqube.yml

@@ -4,16 +4,27 @@ on:
   push:
     branches:
       - develop
+      - feature/sonarcloud-coverage
 
 jobs:
   sonarqube:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         # Disabling shallow clone is recommended for improving relevancy of reporting.
         fetch-depth: 0
 
+    - name: Compile SCs
+      run: make compile-scs
+      working-directory: test
+
+    - name: Test
+      env:
+        ZKPROVER_URI: 127.0.0.1
+      run: make test-full-non-e2e
+      working-directory: test
+
     # Triggering SonarQube analysis as results of it are required by Quality Gate check.
     - name: SonarQube Scan
       uses: sonarsource/sonarqube-scan-action@master

.github/workflows/test-e2e.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
         e2e-group: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, dac-1 ]
     runs-on: ubuntu-latest

.github/workflows/test-from-prover.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
         e2e-group: [ 2 ]
 
@@ -35,7 +35,7 @@ jobs:
         GOARCH: ${{ matrix.goarch }}
 
     - name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/test-full-non-e2e.yml

@@ -14,7 +14,7 @@ jobs:
   test-full-non-e2e:
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:

.github/workflows/updatedeps.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: "1.19.x"
+        go-version: "1.21.x"
       env:
         GOARCH: "amd64"
 

.gitignore

@@ -10,6 +10,11 @@
 /test/contracts/bin/**/*.bin
 /test/contracts/bin/**/*.abi
 
+/tools/datastreamer/*.bin
+/test/datastreamer/*.db/*
+/test/*.bin
+/test/*.db/*
+
 **/.DS_Store
 .vscode
 .idea/
@@ -18,4 +23,6 @@ out.dat
 
 cmd/__debug_bin
 
-.venv
+.venv
+
+*metrics.txt

.goreleaser.yaml

@@ -9,6 +9,11 @@ builds:
     - arm64
   env:
     - CGO_ENABLED=0
+  ldflags:
+    - -X github.com/0xPolygonHermez/zkevm-node.Version={{.Version}}
+    - -X github.com/0xPolygonHermez/zkevm-node.GitRev={{.Commit}} 
+    - -X github.com/0xPolygonHermez/zkevm-node.BuildDate={{.Date}}
+    - -X github.com/0xPolygonHermez/zkevm-node.GitBranch={{.Branch}}
 release:
   # If set to auto, will mark the release as not ready for production
   # in case there is an indicator for this in the tag e.g. v1.0.0-rc1

CONTRIBUTING.md

@@ -2,22 +2,22 @@
 
 This document addresses how we should create PRs, give and receive reviews. The motivation is to have better code, reduce the time from creation to merge while sharing knowledge and insights that help everyone becoming better developers.
 
-Note that non of this is a hard rule, but suggestions / guidelines. Although everyone is encouraged to stick to this points as much as posible. Use your common sense if some of this do not apply well on a particular PR
+Note that non of this is a hard rule, but suggestions / guidelines. Although everyone is encouraged to stick to this points as much as possible. Use your common sense if some of this do not apply well on a particular PR
 
 ## How to create a good PR
 
 - Follow the template, unless for some reason it doesn't fit the content of the PR
 - Try hard on doing small PRs (> ~400 lines), in general is better to have 2 small PRs rather than a big one
 - Indicate clearly who should review it, ideally 2 team mates
-- Author of the PR is responsible for merging. Never do it until you have the aproval of the specified reviewers unless you have their explicit permision
+- Author of the PR is responsible for merging. Never do it until you have the approval of the specified reviewers unless you have their explicit permission
 - Introduce the purpose of the PR, for example: `Fixes the handle of ...`
 - Give brief context on why this is being done and link it to any relevant issue
 - Feel free to ask to specific team mates to review specific parts of the PR
 
 ## How to do a good review
 
-- In general it's hard to set a quality treshold for changes. A good measure for when to approve is to accept changes once the overall quality of the code has been improved (compared to the code base before the PR)
-- Try hard to avoid taking things personaly. For instance avoid using `I`, `you`, `I (don't) like`, ...
+- In general it's hard to set a quality threshold for changes. A good measure for when to approve is to accept changes once the overall quality of the code has been improved (compared to the code base before the PR)
+- Try hard to avoid taking things personally. For instance avoid using `I`, `you`, `I (don't) like`, ...
 - Ask, don’t tell. ("What about trying...?" rather than "Don’t do...")
 - Try to use positive language. You can even use emoji to clarify tone.
 - Be super clear on how confident you are when requesting changes. One way to do it is by starting the message like this:

Dockerfile

@@ -1,5 +1,5 @@
 # CONTAINER FOR BUILDING BINARY
-FROM golang:1.19 AS build
+FROM golang:1.21 AS build
 
 # INSTALL DEPENDENCIES
 RUN go install github.com/gobuffalo/packr/v2/[email protected]