Merge upstream v0.0.10

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @0xPolygon/core-cdk

.github/actions/monitor-cdk-verified-batches/action.yml

@@ -0,0 +1,21 @@
+---
+name: monitor-cdk-verified-batches
+description: Check that batches are being verified in a CDK environment
+
+inputs:
+  verified_batches_target:
+    description: The minimum number of batches to be verified
+    required: false
+    default: '30'
+  timeout:
+    description: The script timeout in seconds
+    required: false
+    default: '600' # 10 minutes
+
+runs:
+  using: "composite"
+  steps:
+    - name: Check that batches are being verified
+      working-directory: .github/actions/monitor-cdk-verified-batches
+      shell: bash
+      run: ./batch_verification_monitor.sh ${{ inputs.verified_batches_target }} ${{ inputs.timeout }}

.github/actions/monitor-cdk-verified-batches/batch_verification_monitor.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# This script monitors the verification progress of zkEVM batches.
+# Usage: ./batch_verification_monitor <verified_batches_target> <timeout>
+
+# The number of batches to be verified.
+verified_batches_target="$1"
+
+# The script timeout (in seconds).
+timeout="$2"
+
+start_time=$(date +%s)
+end_time=$((start_time + timeout))
+
+rpc_url="$(kurtosis port print cdk-v1 cdk-erigon-node-001 http-rpc)"
+while true; do
+  verified_batches="$(cast to-dec "$(cast rpc --rpc-url "$rpc_url" zkevm_verifiedBatchNumber | sed 's/"//g')")"
+  echo "[$(date '+%Y-%m-%d %H:%M:%S')] Verified Batches: $verified_batches"
+
+  current_time=$(date +%s)
+  if (( current_time > end_time )); then
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] ❌ Exiting... Timeout reached!"
+    exit 1
+  fi
+
+  if (( verified_batches > verified_batches_target )); then
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] ✅ Exiting... $verified_batches batches were verified!"
+    exit 0
+  fi
+
+  sleep 10
+done

.github/workflows/codeql.yml

@@ -48,6 +48,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Install Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.21.x'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/deb_packager.yml

@@ -0,0 +1,126 @@
+name: deb_packager
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - '**'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-*'
+
+jobs:
+  build:
+    permissions:
+      id-token: write
+      contents: write
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@master
+        with:
+            go-version: 1.22.x
+      # Variables
+      - name: Adding TAG to ENV
+        run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
+      - name: adding version
+        run: |
+           NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' ) 
+           echo "VERSION=$NUMERIC_VERSION" >> $GITHUB_ENV
+
+      - name: make clean
+        run: make clean
+
+      - name: build for amd64/x86
+        run: make build
+
+      - name: Making directory structure
+        run: mkdir -p packaging/deb/cdk-data-availability/usr/bin/
+      - name: Copying necessary binary file
+        run: cp -rp dist/cdk-data-availability packaging/deb/cdk-data-availability/usr/bin/
+      - name: create directory structure for systemd
+        run: mkdir -p packaging/deb/cdk-data-availability/lib/systemd/system
+      - name: copy the service file
+        run: cp -rp packaging/package_scripts/systemd/cdk-data-availability.service packaging/deb/cdk-data-availability/lib/systemd/system/
+
+
+      # Control file creation
+      - name: create control file
+        run: |
+            echo "Package: cdk-data-availability" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Section: base" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Priority: optional" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Architecture: amd64" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Maintainer: [email protected]" >> packaging/deb/cdk-data-availability/DEBIAN/control
+            echo "Description: cdk-data-availability binary package" >> packaging/deb/cdk-data-availability/DEBIAN/control
+
+      - name: Creating package for binary for cdk-data-availability ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk-data-availability packaging/deb/cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+           ARCH: amd64
+
+      - name: Running package build
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+           ARCH: amd64
+
+      ### Arm64 setup
+      - name: prepping environment for arm64 build
+        run: make clean
+
+      - name: removing amd64 control file
+        run: rm -rf packaging/deb/cdk-data-availability/DEBIAN/control
+
+      - name: Adding requirements for cross compile
+        run: sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
+
+      - name: build for arm64
+        run: GOARCH=arm64 GOOS=linux CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ CGO_ENABLED=1 go build -o dist/cdk-data-availability ./cmd/main.go
+
+      - name: copying necessary files
+        run: cp -rp dist/cdk-data-availability packaging/deb/cdk-data-availability/usr/bin/
+
+      - name: create control file
+        run: |
+          echo "Package: cdk-data-availability" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Section: base" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Priority: optional" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Architecture: arm64" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Maintainer: [email protected]" >> packaging/deb/cdk-data-availability/DEBIAN/control
+          echo "Description: cdk-data-availability binary package" >> packaging/deb/cdk-data-availability/DEBIAN/control
+
+      - name: Creating package for binary for cdk-data-availability ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk-data-availability packaging/deb/cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: arm64
+
+      - name: Running package build
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        env:
+          ARCH: arm64
+
+      - name: create checksum for the amd64 package for cdk-data-availability
+        run: cd packaging/deb/ && sha256sum cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        env:
+          ARCH: amd64
+
+      - name: create checksum for the arm64 package for cdk-data-availability
+        run: cd packaging/deb/ && sha256sum cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-data-availability-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        env:
+          ARCH: arm64
+
+      - name: Release cdk-data-availability Packages
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ env.GIT_TAG }}
+          prerelease: true
+          files: |
+              packaging/deb/cdk-data-availability**.deb
+              packaging/deb/cdk-data-availability**.deb.checksum

.github/workflows/lint.yml

@@ -15,10 +15,11 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
+          cache: false
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Lint
-        run: |
-          make install-linter
-          make lint
+        uses: golangci/[email protected]
+        with:
+          args: --timeout 10m --verbose

.github/workflows/regression-tests.yml

@@ -0,0 +1,49 @@
+name: Regression Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize]  # Trigger on new PR and existing with new commits
+    branches:
+      - main
+
+jobs:
+  deploy_devnet:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout cdk-data-availability
+        uses: actions/checkout@v4
+        with:
+          path: cdk-data-availability
+
+      - name: Checkout kurtosis-cdk
+        uses: actions/checkout@v4
+        with:
+          repository: 0xPolygon/kurtosis-cdk
+          ref: main
+          path: kurtosis-cdk
+
+      - name: Install Kurtosis CDK tools
+        uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk
+
+      - name: Build docker image
+        working-directory: ./cdk-data-availability
+        run: docker build -t cdk-data-availability:local --file Dockerfile .
+
+      - name: Configure Kurtosis CDK
+        working-directory: ./kurtosis-cdk
+        run: |
+          yq -Y --in-place '.args.data_availability_mode = "cdk-validium"' params.yml
+          yq -Y --in-place '.args.zkevm_da_image = "cdk-data-availability:local"' params.yml
+
+      - name: Deploy Kurtosis CDK package
+        working-directory: ./kurtosis-cdk
+        run: kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
+
+      - name: Set executable permissions for the script
+        working-directory: ./cdk-data-availability
+        run: sudo chmod +x .github/actions/monitor-cdk-verified-batches/batch_verification_monitor.sh
+
+      - name: Monitor verified batches
+        working-directory: ./cdk-data-availability
+        shell: bash
+        run: .github/actions/monitor-cdk-verified-batches/batch_verification_monitor.sh 19 600

.github/workflows/release.yml

@@ -0,0 +1,43 @@
+name: Release
+
+on:
+  push:
+    tags:
+      # run only against tags that follow semver (https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string)
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+      - 'v[0-9]+.[0-9]+.[0-9]+*.[0-9]+'
+
+permissions:
+  contents: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.x
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          distribution: goreleaser
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security-build.yml

@@ -0,0 +1,22 @@
+name: Security Build
+on:
+  push:
+  workflow_dispatch: {}
+
+jobs:
+  govuln:
+    name: Run govuln check and Publish
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Running govulncheck
+        uses: Templum/[email protected]
+        continue-on-error: true
+        env:
+          DEBUG: "true"
+        with:
+          go-version: 1.21.x
+          vulncheck-version: latest
+          package: ./...
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fail-on-vuln: true

.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" ]
     runs-on: ubuntu-latest
     steps:

.github/workflows/test-unit.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:
@@ -40,24 +40,24 @@ jobs:
         name: code-coverage-report
         path: test/coverage.out
 
-  # sonar-cloud:
-  #   needs: test-unit
-  #   name: SonarCloud
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout Code
-  #       uses: actions/checkout@v3
-  #       with:
-  #         submodules: recursive
-  #         fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
-
-  #     - name: Download code coverage results
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: code-coverage-report
-
-  #     - name: Analyze with SonarCloud
-  #       uses: sonarsource/sonarcloud-github-action@master
-  #       env:
-  #         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
-  #         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#  sonar-cloud:
+#    needs: test-unit
+#    name: SonarCloud
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout Code
+#        uses: actions/checkout@v3
+#        with:
+#          submodules: recursive
+#          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+#
+#      - name: Download code coverage results
+#        uses: actions/download-artifact@v3
+#        with:
+#          name: code-coverage-report
+#
+#      - name: Analyze with SonarCloud
+#        uses: sonarsource/sonarcloud-github-action@master
+#        env:
+#          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -4,3 +4,4 @@ dist
 
 test/gethData
 test/coverage.out
+coverage.out