Merge branch 'develop' into fix-remove-maxHeightDiff

zeta-chain · May 21, 2024 · 7981347 · 7981347
2 parents cc17d60 + 6369109
commit 7981347
Show file tree

Hide file tree

Showing 57 changed files with 605 additions and 442 deletions.
diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
@@ -28,9 +28,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       if: ${{ inputs.skip_go == 'false' }}
       with:
         go-version: '1.20'

diff --git a/.github/actions/set-branch-name/action.yml b/.github/actions/set-branch-name/action.yml
@@ -19,7 +19,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set branch name
       id: set-branch-name

diff --git a/.github/actions/upgrade-testing/action.yml b/.github/actions/upgrade-testing/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,12 +25,12 @@ env:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 15
     concurrency:
       group: "build-and-test"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set CPU Architecture
         shell: bash
@@ -54,7 +54,7 @@ jobs:
           skip_docker_compose: "false"
 
       - name: Test
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 20
           max_attempts: 2
@@ -82,16 +82,30 @@ jobs:
           chmod a+x ./zetacored
           ./zetacored version
 
+      - name: Upload zetacored
+        uses: actions/upload-artifact@v4
+        with:
+          name: zetacored
+          path: ~/go/bin/zetacored
+          retention-days: 30
+
+      - name: Upload zetaclientd
+        uses: actions/upload-artifact@v4
+        with:
+          name: zetaclientd
+          path: ~/go/bin/zetaclientd
+          retention-days: 30
+
       - name: Clean Up Workspace
         if: always()
         shell: bash
         run: rm -rf *
 
   e2e-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set CPU Architecture
         shell: bash

diff --git a/.github/workflows/change-log-check.yml b/.github/workflows/change-log-check.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -57,7 +57,7 @@ jobs:
     runs-on: buildjet-4vcpu-ubuntu-2204-arm
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/execute_advanced_tests.yaml b/.github/workflows/execute_advanced_tests.yaml
@@ -35,7 +35,7 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start Test
         run: make start-e2e-admin-test
@@ -68,7 +68,7 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start Test
         run: make start-upgrade-test
@@ -100,7 +100,7 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start Test
         run: make start-upgrade-test-light
@@ -123,7 +123,7 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start Test
         run: make start-e2e-performance-test

diff --git a/.github/workflows/generate-files.yml b/.github/workflows/generate-files.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: bufbuild/buf-setup-action@v1
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -40,13 +40,13 @@ jobs:
     steps:
       - name: Checkout Source
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
 
@@ -71,13 +71,13 @@ jobs:
     steps:
       - name: Checkout Source
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
 
@@ -101,13 +101,13 @@ jobs:
     steps:
       - name: Checkout Source
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
 
@@ -133,7 +133,7 @@ jobs:
 
       - name: Checkout code
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -174,7 +174,7 @@ jobs:
     timeout-minutes: 10
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: ${{ github.event.inputs.skip_checks != 'true' }}
         with:
           fetch-depth: 0
@@ -209,7 +209,7 @@ jobs:
     steps:
       - name: "Checkout Code"
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set CPU Architecture
         if: ${{ github.event.inputs.skip_checks != 'true' }}
@@ -284,7 +284,7 @@ jobs:
     steps:
       - name: "Checkout Code"
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set CPU Architecture
         if: ${{ github.event.inputs.skip_checks != 'true' }}
@@ -362,7 +362,7 @@ jobs:
     steps:
       - name: "Checkout Code"
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Execute e2e-admin-tests
         if: ${{ github.event.inputs.skip_checks != 'true' }}
@@ -384,7 +384,7 @@ jobs:
     steps:
       - name: "Checkout Code"
         if: ${{ github.event.inputs.skip_checks != 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Execute upgrade-test
         if: ${{ github.event.inputs.skip_checks != 'true' }}
@@ -415,7 +415,7 @@ jobs:
     timeout-minutes: 60
     environment: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Pipeline Dependencies
         uses: ./.github/actions/install-dependencies

diff --git a/.github/workflows/rc-release.yml b/.github/workflows/rc-release.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -39,7 +39,7 @@ jobs:
     needs:
       - pre-release-checks
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set CPU Architecture
         shell: bash

diff --git a/.github/workflows/sast-linters.yml b/.github/workflows/sast-linters.yml
@@ -20,12 +20,12 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        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.20'
 
@@ -40,12 +40,12 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        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.20'
 
@@ -59,12 +59,12 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        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.20'
 

diff --git a/.github/workflows/upgrade_path_testing.yaml b/.github/workflows/upgrade_path_testing.yaml
@@ -66,7 +66,7 @@ jobs:
         with:
           version: 2
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           check-latest: false
           go-version: '^1.20'

diff --git a/changelog.md b/changelog.md
@@ -19,13 +19,14 @@
 ### Refactor
 
 * [2094](https://github.com/zeta-chain/node/pull/2094) - upgrade go-tss to use cosmos v0.47
-* [2110](https://github.com/zeta-chain/node/pull/2110) - move non-query rate limiter logic to zetaclient side and code refactor.
+* [2110](https://github.com/zeta-chain/node/pull/2110) - move non-query rate limiter logic to zetaclient side and code refactor
 * [2032](https://github.com/zeta-chain/node/pull/2032) - improve some general structure of the ZetaClient codebase
 * [2097](https://github.com/zeta-chain/node/pull/2097) - refactor lightclient verification flags to account for individual chains
 * [2071](https://github.com/zeta-chain/node/pull/2071) - Modify chains struct to add all chain related information
 * [2118](https://github.com/zeta-chain/node/pull/2118) - consolidate inbound and outbound naming
 * [2124](https://github.com/zeta-chain/node/pull/2124) - removed unused variables and method
-* [2150](https://github.com/zeta-chain/node/pull/2150) - created `chains` `zetacore` `orchestrator` packages in zetaclient and reorganized source files accordingly.
+* [2150](https://github.com/zeta-chain/node/pull/2150) - created `chains` `zetacore` `orchestrator` packages in zetaclient and reorganized source files accordingly
+* [2210](https://github.com/zeta-chain/node/pull/2210) - removed uncessary panics in the zetaclientd process
 * [2205](https://github.com/zeta-chain/node/pull/2205) - remove deprecated variables pre-v17
 
 ### Tests

diff --git a/cmd/zetaclientd-supervisor/main.go b/cmd/zetaclientd-supervisor/main.go
@@ -16,10 +16,13 @@ import (
 )
 
 func main() {
+	// load zetaclient config
 	cfg, err := config.Load(app.DefaultNodeHome)
 	if err != nil {
-		panic(fmt.Errorf("failed to load config: %w", err))
+		fmt.Println("failed to load config: ", err)
+		os.Exit(1)
 	}
+
 	// log outputs must be serialized since we are writing log messages in this process and
 	// also directly from the zetaclient process
 	serializedStdout := &serializedWriter{upstream: os.Stdout}
@@ -38,13 +41,15 @@ func main() {
 
 	hotkeyPassword, tssPassword, err := promptPasswords()
 	if err != nil {
-		panic(fmt.Errorf("unable to get passwords: %w", err))
+		logger.Error().Err(err).Msg("unable to get passwords")
+		os.Exit(1)
 	}
 
 	_, enableAutoDownload := os.LookupEnv("ZETACLIENTD_SUPERVISOR_ENABLE_AUTO_DOWNLOAD")
 	supervisor, err := newZetaclientdSupervisor(cfg.ZetaCoreURL, logger, enableAutoDownload)
 	if err != nil {
-		panic(fmt.Errorf("unable to get supervisor: %w", err))
+		logger.Error().Err(err).Msg("unable to get supervisor")
+		os.Exit(1)
 	}
 	supervisor.Start(ctx)