V0.5.0 to main

.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/lint.yml

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

.github/workflows/push-docker.yml

@@ -1,35 +1,35 @@
 on:
   push:
-    branches:
-    - main
+    tags:
+    - 'v[0-9]+.[0-9]+.[0-9]+*' # this action will only run on tags that follow semver
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 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@v1 
+        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
           push: true
           tags: |
-            hermeznetwork/zkevm-bridge-service
-            hermeznetwork/zkevm-bridge-service:2.0
+            hermeznetwork/zkevm-bridge-service:${{ github.ref_name }}
           build-args: |
             PRIVATE_TOKEN=${{secrets.GIT_TOKEN}}

.github/workflows/release.yml

@@ -3,32 +3,32 @@ name: goreleaser
 on:
   push:
     tags:
-      - 'v*.*.*'
+    - 'v[0-9]+.[0-9]+.[0-9]+' # this action will only run on tags that follow semver
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Get packr
-        run: go get -u github.com/gobuffalo/packr/v2/packr2
+        run: go install github.com/gobuffalo/packr/v2/packr2@v2.8.3
 
       - name: Prepare
         run: git reset --hard
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN_RELEASE }}
+          GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}

.github/workflows/test-e2e.yml

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

.github/workflows/test-e2ecompress.yml

@@ -0,0 +1,27 @@
+name: Test
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+      - update-external-dependencies
+  pull_request:
+jobs:
+  test-e2ecompress:
+    strategy:
+      matrix:
+        go-version: [ 1.21.x ]
+        goarch: [ "amd64" ]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go-version }}
+      env:
+        GOARCH: ${{ matrix.goarch }}
+    - name: Test
+      run: make test-e2ecompress

.github/workflows/test-edge.yml

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

.github/workflows/test-l2l2.yml

@@ -0,0 +1,27 @@
+name: Test
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+      - update-external-dependencies
+  pull_request:
+jobs:
+  test-l2l2:
+    strategy:
+      matrix:
+        go-version: [ 1.21.x ]
+        goarch: [ "amd64" ]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go-version }}
+      env:
+        GOARCH: ${{ matrix.goarch }}
+    - name: Test
+      run: make test-l2l2

.github/workflows/test-multiplerollups.yml

@@ -0,0 +1,27 @@
+name: Test
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+      - update-external-dependencies
+  pull_request:
+jobs:
+  test-multiplerollups:
+    strategy:
+      matrix:
+        go-version: [ 1.21.x ]
+        goarch: [ "amd64" ]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go-version }}
+      env:
+        GOARCH: ${{ matrix.goarch }}
+    - name: Test
+      run: make test-multiplerollups

.github/workflows/test.yml

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

.github/workflows/updatedeps.yml

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

.goreleaser.yml

@@ -0,0 +1,22 @@
+# .goreleaser.yaml
+builds:
+- main: ./cmd/
+  goos:
+    - linux
+    - darwin
+  goarch:
+    - amd64
+    - arm64
+  env:
+    - CGO_ENABLED=0
+  ldflags:
+    - -X github.com/0xPolygonHermez/zkevm-bridge-service.Version={{.Version}}
+    - -X github.com/0xPolygonHermez/zkevm-bridge-service.GitRev={{.Commit}} 
+    - -X github.com/0xPolygonHermez/zkevm-bridge-service.BuildDate={{.Date}}
+    - -X github.com/0xPolygonHermez/zkevm-bridge-service.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
+  # If set to true, will mark the release as not ready for production.
+  # Default is false.
+  prerelease: true

Dockerfile

@@ -1,5 +1,5 @@
 # CONTAINER FOR BUILDING BINARY
-FROM golang:1.19 AS build
+FROM golang:1.21 AS build
 
 ENV CGO_ENABLED=0
 # INSTALL DEPENDENCIES
@@ -15,6 +15,7 @@ RUN cd /src && make build
 # CONTAINER FOR RUNNING BINARY
 FROM alpine:3.16.0
 COPY --from=build /src/dist/zkevm-bridge /app/zkevm-bridge
+COPY --from=build /src/dist/test-deploy-claimcompressor /app/test-deploy-claimcompressor
 COPY --from=build /src/test/vectors /app/test/vectors
 EXPOSE 8080
 EXPOSE 9090