Merge pull request #1715 from 0xPolygon/v2.2.10-candidate

v2.2.10

Author: pratikspatil024

.github/matic-cli-config.yml

@@ -390,3 +390,4 @@ jobs:
             packaging/deb/bor-pbss-amoy-**.deb 
             packaging/deb/bor-amoy-**.deb.checksum
             packaging/deb/bor-pbss-amoy-**.deb.checksum
+            builder/files/genesis-amoy.json

.github/workflows/amoy_deb_profiles.yml

@@ -1,9 +1,9 @@
 name: CI
+
 on:
   push:
     branches:
       - 'master'
-      - 'qa'
       - 'develop'
   pull_request:
     branches:
@@ -180,119 +180,3 @@ jobs:
         uses: actions/download-artifact@v4.1.8
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
-
-  e2e-tests:
-    if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
-    strategy:
-      matrix:
-        os: [ubuntu-22.04] # List of OS: https://github.com/actions/virtual-environments
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: bor
-      - name: Checkout submodules
-        run: |
-          cd bor
-          git submodule update --init --recursive --force
-          git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 1.24.3
-
-      - name: Checkout matic-cli
-        uses: actions/checkout@v4
-        with:
-          repository: maticnetwork/matic-cli
-          ref: heimdall-v2
-          path: matic-cli
-
-      - name: Install dependencies on Linux
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt update
-          sudo apt install build-essential
-          curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
-          sudo apt install jq curl
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18.19.0'
-          cache: 'npm'
-          cache-dependency-path: |
-            matic-cli/package-lock.json
-            matic-cli/devnet/code/contracts/package-lock.json
-            matic-cli/devnet/code/genesis-contracts/package-lock.json
-            matic-cli/devnet/code/genesis-contracts/matic-contracts/package-lock.json
-
-      - name: Install solc-select
-        run: |
-          sudo apt update
-          sudo apt install python3 python3-pip -y
-          sudo ln -sf /usr/bin/python3 /usr/bin/python
-          pip install solc-select
-
-      - name: Install Solidity Version
-        run: |
-          solc-select install 0.5.17
-          solc-select install 0.6.12
-          solc-select use 0.5.17
-          solc --version
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Bootstrap devnet
-        run: |
-          cd matic-cli
-          npm install --prefer-offline --no-audit --progress=false
-          mkdir devnet
-          cd devnet
-          ../bin/matic-cli.js setup devnet -c ../../bor/.github/matic-cli-config.yml
-
-      - name: Launch devnet
-        run: |
-          cd matic-cli/devnet
-          bash ../util-scripts/docker/devnet_setup.sh
-          cd -
-          timeout 2m bash bor/integration-tests/bor_health.sh
-
-      - name: Run smoke tests
-        run: |
-          timeout 20m bash bor/integration-tests/smoke_test.sh
-
-      - name: Run RPC Tests
-        run: |
-          echo "Starting RPC Tests..."
-          timeout 5m bash bor/integration-tests/rpc_test.sh
-
-      - name: Resolve absolute path for logs
-        id: pathfix
-        run: |
-          echo "ABS_LOG_PATH=$(realpath matic-cli/devnet/logs)" >> $GITHUB_ENV
-
-      - name: Upload logs
-        if: always()
-        uses: PaloAltoNetworks/upload-secure-artifact@main
-        with:
-          name: logs_${{ github.run_id }}
-          path: ${{ env.ABS_LOG_PATH }}
-
-      - name: Package code and chain data
-        if: always()
-        run: |
-          cd matic-cli/devnet
-          docker compose down --remove-orphans
-          cd -
-          mkdir -p ${{ github.run_id }}/matic-cli
-          sudo mv bor ${{ github.run_id }}
-          sudo mv matic-cli/devnet ${{ github.run_id }}/matic-cli
-          sudo tar --warning=no-file-changed --exclude='.git' -czf code.tar.gz ${{ github.run_id }}
-
-      - name: Upload code and chain data
-        if: always()
-        uses: PaloAltoNetworks/upload-secure-artifact@main
-        with:
-          name: code_${{ github.run_id }}
-          path: code.tar.gz

.github/workflows/ci.yml

@@ -0,0 +1,95 @@
+name: Kurtosis E2E Tests
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+  pull_request:
+    branches:
+      - 'master'
+      - 'develop'
+    types: [opened, synchronize]
+
+concurrency:
+  group: kurtosis-e2e-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  ENCLAVE_NAME: kurtosis-e2e
+
+jobs:
+  e2e-tests:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install build-essential
+
+      - name: Checkout bor
+        uses: actions/checkout@v5
+        with:
+          path: bor
+
+      - name: Checkout heimdall-v2
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/heimdall-v2
+          ref: develop
+          path: heimdall-v2
+
+      - name: Checkout pos-workflows
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/pos-workflows
+          ref: main
+          path: pos-workflows
+
+      - name: Checkout kurtosis-pos
+        uses: actions/checkout@v5
+        with:
+          repository: 0xPolygon/kurtosis-pos
+          ref: v1.1.4
+          path: kurtosis-pos
+
+      - name: Pre kurtosis run
+        uses: ./pos-workflows/.github/actions/kurtosis-pre-run
+        with:
+          docker_username: ${{ secrets.DOCKERHUB }}
+          docker_token: ${{ secrets.DOCKERHUB_KEY }}
+
+      - name: Build bor docker image
+        run: |
+          cd bor
+          docker build -t bor:local --file Dockerfile .
+
+      - name: Build heimdall-v2 docker image
+        run: |
+          cd heimdall-v2
+          docker build -t heimdall-v2:local --file Dockerfile .
+
+      - name: Copy kurtosis config
+        run: cp ./pos-workflows/.github/configs/kurtosis-e2e.yml ./kurtosis-pos/kurtosis-e2e.yml
+
+      - name: Kurtosis run
+        run: |
+          cd kurtosis-pos
+          kurtosis run --args-file=kurtosis-e2e.yml --enclave=${{ env.ENCLAVE_NAME }} .
+
+      - name: Inspect enclave
+        run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
+
+      - name: Test state syncs
+        run: kurtosis service exec ${{ env.ENCLAVE_NAME }} test-runner "bats --filter-tags pos,bridge,l1,l2 --recursive tests/"
+
+      - name: Run smoke tests (Checkpoints and Milestones)
+        run: bash ./pos-workflows/tests/kurtosis_smoke_test.sh
+
+      - name: Post kurtosis run
+        if: always()
+        uses: ./pos-workflows/.github/actions/kurtosis-post-run
+        with:
+          enclave_name: ${{ env.ENCLAVE_NAME }}

.github/workflows/kurtosis-e2e.yml

@@ -400,3 +400,4 @@ jobs:
             packaging/deb/bor-pbss-mainnet-**.deb
             packaging/deb/bor-mainnet-**.deb.checksum
             packaging/deb/bor-pbss-mainnet-**.deb.checksum
+            builder/files/genesis-mainnet-v1.json

.github/workflows/mainnet_deb_profiles.yml

@@ -1,29 +1,39 @@
-FROM golang:latest
+# ─── BUILDER STAGE ───────────────────────────────────────────────────────────────
+FROM golang:1.24-alpine AS builder
 
-ARG BOR_DIR=/var/lib/bor
+ARG BOR_DIR=/var/lib/bor/
 ENV BOR_DIR=$BOR_DIR
 
-RUN apt-get update -y && apt-get upgrade -y \
-  && apt install build-essential git -y \
-  && mkdir -p ${BOR_DIR}
+RUN apk add --no-cache build-base git linux-headers
 
 WORKDIR ${BOR_DIR}
 
-# Copy go.mod and go.sum first to leverage Docker's cache
 COPY go.mod go.sum ./
 
-# Download dependencies separately (this layer can be cached)
-RUN --mount=type=ssh go mod download
+RUN --mount=type=ssh \
+    --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 
-# Copy the rest of the application code
 COPY . .
 
-# Build the application
-RUN --mount=type=ssh make bor
+RUN --mount=type=ssh \
+    --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    make bor
 
-RUN cp build/bin/bor /usr/bin/
+# ─── RUNTIME STAGE ────────────────────────────────────────────────────────────────
+FROM alpine:latest
+
+ARG BOR_DIR=/var/lib/bor/
+ENV BOR_DIR=$BOR_DIR
+
+RUN apk add --no-cache bash ca-certificates && \
+    mkdir -p ${BOR_DIR}
+
+WORKDIR ${BOR_DIR}
+
+COPY --from=builder ${BOR_DIR}/build/bin/bor /usr/bin/
 
-ENV SHELL /bin/bash
 EXPOSE 8545 8546 8547 30303 30303/udp
 
-ENTRYPOINT ["bor"]
+ENTRYPOINT ["bor"]

Dockerfile

@@ -1,16 +1,16 @@
-FROM alpine:3.14
+FROM alpine:latest
 
-ARG BOR_DIR=/var/lib/bor
+ARG BOR_DIR=/var/lib/bor/
 ENV BOR_DIR=$BOR_DIR
 
-RUN apk add --no-cache ca-certificates && \
-    mkdir -p ${BOR_DIR}
+RUN apk add --no-cache ca-certificates && mkdir -p ${BOR_DIR}
 
 WORKDIR ${BOR_DIR}
 COPY bor /usr/bin/
+COPY builder/files/genesis-amoy.json ${BOR_DIR}
 COPY builder/files/genesis-mainnet-v1.json ${BOR_DIR}
 COPY builder/files/genesis-testnet-v4.json ${BOR_DIR}
-COPY builder/files/genesis-amoy.json ${BOR_DIR}
 
 EXPOSE 8545 8546 8547 30303 30303/udp
+
 ENTRYPOINT ["bor"]

Dockerfile.release

@@ -214,7 +214,7 @@ geth-windows-amd64:
 	@echo "Windows amd64 cross compilation done:"
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
 
-PACKAGE_NAME          := github.com/maticnetwork/bor
+PACKAGE_NAME          := github.com/0xPolygon/bor
 GOLANG_CROSS_VERSION  ?= v1.22.1
 
 .PHONY: release-dry-run

Makefile

@@ -1,17 +1,17 @@
 # Bor Overview
 Bor is the official Golang implementation of the Polygon PoS blockchain. It is a fork of [geth](https://github.com/ethereum/go-ethereum) and is EVM compatible (upto London fork).
 
-[![API Reference](https://pkg.go.dev/badge/github.com/maticnetwork/bor)](https://pkg.go.dev/github.com/maticnetwork/bor)
-[![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor)
-![MIT License](https://img.shields.io/github/license/maticnetwork/bor)
+[![API Reference](https://pkg.go.dev/badge/github.com/0xPolygon/bor)](https://pkg.go.dev/github.com/0xPolygon/bor)
+[![Go Report Card](https://goreportcard.com/badge/github.com/0xPolygon/bor)](https://goreportcard.com/report/github.com/0xPolygon/bor)
+![MIT License](https://img.shields.io/github/license/0xPolygon/bor)
 [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.com/invite/0xpolygonrnd)
 [![Twitter Follow](https://img.shields.io/twitter/follow/0xPolygon.svg?style=social)](https://twitter.com/0xPolygon)
 
 ### Installing bor using packaging
 
-The easiest way to get started with bor is to install the packages using the command below. Please take a look at the [releases](https://github.com/maticnetwork/bor/releases) section to find the latest stable version of bor.
+The easiest way to get started with bor is to install the packages using the command below. Please take a look at the [releases](https://github.com/0xPolygon/bor/releases) section to find the latest stable version of bor.
 
-    curl -L https://raw.githubusercontent.com/maticnetwork/install/main/bor.sh | bash -s -- v2.0.0 <network> <node_type>
+    curl -L https://raw.githubusercontent.com/0xPolygon/install/main/bor.sh | bash -s -- v2.0.0 <network> <node_type>
 
 The network accepts `mainnet`, or `amoy` and the node type accepts `validator` or `sentry` or `archive`. The installation script does the following things:
 - Create a new user named `bor`.

README.md

@@ -39,7 +39,7 @@ Modify the RUN git clone line in the Dockerfile for repo “retesteth” to chan
 Modify the Dockerfile so that the eth client points to bor  
 e.g. : `https://github.com/ethereum/retesteth/blob/master/Dockerfile#L41`
 from `RUN git clone --depth 1 -b master https://github.com/ethereum/go-ethereum.git /geth`
-to: `RUN git clone --depth 1 -b master https://github.com/maticnetwork/bor.git /geth`
+to: `RUN git clone --depth 1 -b master https://github.com/0xPolygon/bor.git /geth`
 
 - build docker image
 `sudo ./dretesteth.sh build`