conflicts

.github/workflows/build.yml

@@ -1,6 +1,9 @@
 name: PR Testing
 
 on:
+  push:
+    branches:
+      - develop
   pull_request:
     branches:
       - develop
@@ -59,7 +62,14 @@ jobs:
           command: |
             echo "Running Build Tests"
             make clean
-            make test
+            make test-coverage
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/[email protected]
+        with:
+          file: coverage.out
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: zeta-chain/node
 
       - name: Build zetacored and zetaclientd
         env:
@@ -77,7 +87,7 @@ jobs:
         shell: bash
         run: rm -rf *
 
-  smoke-test:
+  e2e-test:
     runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 25
     steps:
@@ -120,12 +130,12 @@ jobs:
           cd contrib/localnet/ 
           docker compose up -d zetacore0 zetacore1 zetaclient0 zetaclient1 eth bitcoin
 
-      - name: Run Smoke Test
+      - name: Run E2E Test
         run: |
           cd contrib/localnet
           docker-compose up orchestrator --exit-code-from orchestrator
           if [ $? -ne 0 ]; then
-            echo "Smoke Test Failed"
+            echo "E2E Test Failed"
             exit 1
           fi
 

.github/workflows/publish-release.yml

@@ -216,7 +216,14 @@ jobs:
           command: |
             echo "Running Build Tests"
             make clean
-            make test
+            make test-coverage
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/[email protected]
+        with:
+          file: coverage.out
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: zeta-chain/node
 
       - name: Build zetacored and zetaclientd
         if: ${{ github.event.inputs.skip_checks != 'true' }}

Dockerfile

@@ -1,3 +1,9 @@
+# Purpose: This Dockerfile creates an environment for running ZetaChain
+# It contains:
+# - zetacored: the ZetaChain node binary
+# - zetaclientd: the ZetaChain client binary for observers
+# - zetae2e: the ZetaChain end-to-end tests CLI
+
 FROM golang:1.20-alpine3.18
 
 ENV GOPATH /go
@@ -10,15 +16,9 @@ RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""
 WORKDIR /go/delivery/zeta-node
 COPY go.mod .
 COPY go.sum .
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    go mod download
+
 RUN go mod download
 COPY . .
-
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install-zetae2e
 RUN make install
 RUN make install-zetae2e
 #

Dockerfile-versioned-source → Dockerfile-upgrade

@@ -1,11 +1,14 @@
 FROM golang:1.20-alpine3.18
 
+# Purpose: This Dockerfile creates an environment for performing an upgrade test on ZetaChain
+# It contains the ZetaChain and ZetaClient binaries for two different versions of ZetaChain
+# One is specified with the old_version argument and the other is the current source code
+# The image also contains the cosmovisor binary for running the upgrade test
+
 ENV GOPATH /go
 ENV GOOS=linux
 ENV CGO_ENABLED=1
 
-ARG old_version
-
 RUN apk --no-cache add git make build-base jq openssh libusb-dev linux-headers bash curl tmux
 RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""
 
@@ -17,6 +20,7 @@ WORKDIR /go/delivery/zeta-node
 RUN mkdir -p  $GOPATH/bin/old
 RUN mkdir -p  $GOPATH/bin/new
 
+ARG OLD_VERSION=v13.0.0
 ENV NEW_VERSION=v14
 
 # Build new release from the current source
@@ -33,7 +37,7 @@ RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/new/
 RUN git clone https://github.com/zeta-chain/node.git
 RUN cd node && git fetch
 
-RUN cd node && git checkout ${old_version}
+RUN cd node && git checkout ${OLD_VERSION}
 RUN cd node && make install
 RUN cp $GOPATH/bin/zetacored $GOPATH/bin/old/
 RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/old/