Merge remote-tracking branch 'origin/main' into merge-main-10-16-23

Fix merge conflicts from main to hotstuff_integration
AntelopeIO · Oct 17, 2023 · 5ac988e · 5ac988e
2 parents b97c279 + 0544e2c
commit 5ac988e
Show file tree

Hide file tree

Showing 143 changed files with 4,152 additions and 2,685 deletions.
diff --git a/.cicd/defaults.json b/.cicd/defaults.json
@@ -4,6 +4,6 @@
        "prerelease":false
     },
     "eossystemcontracts":{
-       "ref":"release/3.1"
+       "ref":"release/3.2"
     }
  }
diff --git a/.cicd/platforms.json b/.cicd/platforms.json
diff --git a/.cicd/platforms/ubuntu20.Dockerfile b/.cicd/platforms/ubuntu20.Dockerfile
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get upgrade -y && \
                        jq                   \
                        libcurl4-openssl-dev \
                        libgmp-dev           \
-                       libssl-dev           \
                        llvm-11-dev          \
                        ninja-build          \
                        python3-numpy        \

diff --git a/.cicd/platforms/ubuntu22.Dockerfile b/.cicd/platforms/ubuntu22.Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update && apt-get upgrade -y && \
                        jq                   \
                        libcurl4-openssl-dev \
                        libgmp-dev           \
-                       libssl-dev           \
                        llvm-11-dev          \
                        ninja-build          \
                        python3-numpy        \

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,23 +31,23 @@ defaults:
     shell: bash
 
 jobs:
-  platforms:
-    name: Run Platforms Workflow
-    uses: ./.github/workflows/platforms.yaml
+  platform-cache:
+    name: Platform Cache
+    uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@v1
     permissions:
       packages: write
       contents: read
+    with:
+      runs-on: '["self-hosted", "enf-x86-beefy"]'
+      platform-files: .cicd/platforms
 
   build-base:
     name: Run Build Workflow
     uses: ./.github/workflows/build_base.yaml
-    needs: [platforms]
+    needs: [platform-cache]
     with:
-      p: ${{needs.platforms.outputs.p}}
-      platform-matrix: ${{needs.platforms.outputs.platform-matrix}}
-    permissions:
-      packages: write
-      contents: read
+      platforms: ${{needs.platform-cache.outputs.platforms}}
+      platform-list: ${{needs.platform-cache.outputs.platform-list}}
 
   v:
     name: Discover Versions
@@ -79,14 +79,13 @@ jobs:
 
   dev-package:
     name: Build leap-dev package
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
         platform: [ubuntu20, ubuntu22]
     runs-on: ubuntu-latest
-    container: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+    container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -115,15 +114,14 @@ jobs:
 
   tests:
     name: Tests
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
         platform: [ubuntu20, ubuntu22]
     runs-on: ["self-hosted", "enf-x86-hightier"]
     container:
-      image: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+      image: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
       options: --security-opt seccomp=unconfined
     steps:
       - uses: actions/checkout@v3
@@ -143,8 +141,7 @@ jobs:
 
   np-tests:
     name: NP Tests
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
@@ -159,7 +156,7 @@ jobs:
       - name: Run tests in parallel containers
         uses: ./.github/actions/parallel-ctest-containers
         with:
-          container: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+          container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
           error-log-paths: '["build/etc", "build/var", "build/leap-ignition-wd", "build/TestLogs"]'
           log-tarball-prefix: ${{matrix.platform}}
           tests-label: nonparallelizable_tests
@@ -173,8 +170,7 @@ jobs:
 
   lr-tests:
     name: LR Tests
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
@@ -189,7 +185,7 @@ jobs:
       - name: Run tests in parallel containers
         uses: ./.github/actions/parallel-ctest-containers
         with:
-          container: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+          container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
           error-log-paths: '["build/etc", "build/var", "build/leap-ignition-wd", "build/TestLogs"]'
           log-tarball-prefix: ${{matrix.platform}}
           tests-label: long_running_tests
@@ -203,15 +199,14 @@ jobs:
 
   libtester-tests:
     name: libtester tests
-    needs: [platforms, build-base, v, dev-package]
-    if: always() && needs.platforms.result == 'success' && needs.v.result == 'success' && needs.dev-package.result == 'success'
+    needs: [platform-cache, build-base, v, dev-package]
     strategy:
       fail-fast: false
       matrix:
         platform: [ubuntu20, ubuntu22]
         test: [build-tree, make-dev-install, deb-install]
     runs-on:  ["self-hosted", "enf-x86-midtier"]
-    container: ${{ matrix.test != 'deb-install' && fromJSON(needs.platforms.outputs.p)[matrix.platform].image || matrix.platform == 'ubuntu20' && 'ubuntu:focal' || 'ubuntu:jammy' }}
+    container: ${{ matrix.test != 'deb-install' && fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image || matrix.platform == 'ubuntu20' && 'ubuntu:focal' || 'ubuntu:jammy' }}
     env:
       DEBIAN_FRONTEND: noninteractive
       TZ: Etc/UTC

diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml
@@ -3,12 +3,12 @@ name: "Build leap"
 on:
   workflow_call:
     inputs:
-      p:
-        description: "Discovered Build Platforms"
+      platforms:
+        description: "Platforms definitions"
         type: string
         required: true
-      platform-matrix:
-        description: "Platform Matrix"
+      platform-list:
+        description: "Array of platforms"
         type: string
         required: true
 
@@ -26,9 +26,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{fromJSON(inputs.platform-matrix)}}
+        platform: ${{fromJSON(inputs.platform-list)}}
     runs-on: ["self-hosted", "enf-x86-beefy"]
-    container: ${{fromJSON(inputs.p)[matrix.platform].image}}
+    container: ${{fromJSON(inputs.platforms)[matrix.platform].image}}
     steps:
         - uses: actions/checkout@v3
           with:

diff --git a/.github/workflows/performance_harness_run.yaml b/.github/workflows/performance_harness_run.yaml
@@ -12,6 +12,16 @@ on:
       override-test-params:
         description: 'Override perf harness params'
         type: string
+      override-leap:
+        description: Override leap target
+        type: string
+      override-leap-prerelease:
+        type: choice
+        description: Override leap prelease
+        options:
+        - default
+        - true
+        - false
 
 permissions:
   packages: read
@@ -28,31 +38,39 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       test-params: ${{steps.overrides.outputs.test-params}}
+      leap-target: ${{steps.overrides.outputs.leap-target}}
+      leap-prerelease: ${{steps.overrides.outputs.leap-prerelease}}
     steps:
       - name: Setup Input Params
         id: overrides
         run: |
           echo test-params=findMax testBpOpMode >> $GITHUB_OUTPUT
+          echo leap-target="DEFAULT" >> $GITHUB_OUTPUT
+          echo leap-prerelease="false" >> $GITHUB_OUTPUT
 
           if [[ "${{inputs.override-test-params}}" != "" ]]; then
             echo test-params=${{inputs.override-test-params}} >> $GITHUB_OUTPUT
           fi
+          if [[ "${{inputs.override-leap}}" != "" ]]; then
+            echo leap-target=${{inputs.override-leap}} >> $GITHUB_OUTPUT
+          fi
+          if [[ "${{inputs.override-leap-prerelease}}" == +(true|false) ]]; then
+            echo leap-prerelease=${{inputs.override-leap-prerelease}} >> $GITHUB_OUTPUT
+          fi
 
-  platforms:
-    name: Run Platforms Workflow
-    uses: ./.github/workflows/platforms.yaml
-    with:
-      override-build-matrix: ${{github.event.inputs.platform-choice}}
+  platform-cache:
+    name: Platform Cache
+    uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@v1
     permissions:
       packages: write
       contents: read
+    with:
+      runs-on: '["self-hosted", "enf-x86-beefy"]'
+      platform-files: .cicd/platforms
 
   reuse-build:
     name: Reuse leap build
     needs: [v]
-    if: |
-      always() &&
-      needs.v.result == 'success'
     runs-on: ubuntu-latest
     outputs:
       build-artifact: ${{steps.downloadBuild.outputs.downloaded-file}}
@@ -77,44 +95,63 @@ jobs:
 
   build-base:
     name: Run Build Workflow
-    needs: [platforms, reuse-build]
-    if: always() && needs.platforms.result == 'success' && needs.reuse-build.outputs.build-artifact == ''
+    needs: [platform-cache, reuse-build]
+    if: needs.reuse-build.outputs.build-artifact == ''
     uses: ./.github/workflows/build_base.yaml
     with:
-      p: ${{needs.platforms.outputs.p}}
-      platform-matrix: ${{needs.platforms.outputs.platform-matrix}}
-    permissions:
-      packages: write
-      contents: read
+      platforms: ${{needs.platform-cache.outputs.platforms}}
+      platform-list: '["${{github.event.inputs.platform-choice}}"]'
 
   tests:
     name: Tests
-    needs: [v, platforms, reuse-build, build-base]
-    if: always() && needs.platforms.result == 'success' && (needs.build-base.result == 'success' || needs.reuse-build.result == 'success')
-    runs-on: ubuntu-latest
+    needs: [v, platform-cache, reuse-build, build-base]
+    if: always() && (needs.build-base.result == 'success' || needs.reuse-build.result == 'success')
+    runs-on: ["Leap-Perf-Ubuntu-22-16x64x600"]
     container:
-      image: ${{fromJSON(needs.platforms.outputs.p)[github.event.inputs.platform-choice].image}}
+      image: ${{fromJSON(needs.platform-cache.outputs.platforms)[github.event.inputs.platform-choice].image}}
     steps:
       - name: Download builddir
         uses: actions/download-artifact@v3
         with:
           name: ${{github.event.inputs.platform-choice}}-build
-      - name: Run Performance Test
+      - name: Extract Build Directory
         run: |
           zstdcat build.tar.zst | tar x
+      - if: ${{ needs.v.outputs.leap-target != 'DEFAULT' }}
+        name: Download Prev Leap Version
+        uses: AntelopeIO/asset-artifact-download-action@v3
+        with:
+          owner: AntelopeIO
+          repo: leap
+          target: '${{needs.v.outputs.leap-target}}'
+          prereleases: ${{fromJSON(needs.v.outputs.leap-prerelease)}}
+          file: 'leap.*${{github.event.inputs.platform-choice}}.*(x86_64|amd64).deb'
+      - if: ${{ needs.v.outputs.leap-target != 'DEFAULT' }}
+        name: Install leap & replace binaries for PH use
+        run: |
+          apt-get update
+          apt-get install -y ./leap*.deb
+          rm build/bin/nodeos
+          rm build/bin/cleos
+          cp /usr/bin/nodeos build/bin
+          cp /usr/bin/cleos build/bin
+          ./build/bin/nodeos --full-version
+          ./build/bin/cleos version full
+      - name: Run Performance Test
+        run: |
           cd build
           ./tests/PerformanceHarnessScenarioRunner.py ${{needs.v.outputs.test-params}}
       - name: Prepare results
         id: prep-results
         run: |
-          tar -pc build/PerformanceHarnessScenarioRunnerLogs | zstd --long -T0 -9 > PerformanceHarnessScenarioRunnerLogs.tar.zst
+          tar -pc build/PHSRLogs | zstd --long -T0 -9 > PHSRLogs.tar.zst
       - name: Upload results
         uses: AntelopeIO/upload-artifact-large-chunks-action@v1
         with:
           name: performance-test-results
-          path: PerformanceHarnessScenarioRunnerLogs.tar.zst
+          path: PHSRLogs.tar.zst
       - name: Upload report
         uses: actions/upload-artifact@v3
         with:
           name: performance-test-report
-          path: ./build/PerformanceHarnessScenarioRunnerLogs/**/report.json
+          path: ./build/PHSRLogs/**/report.json
diff --git a/.github/workflows/ph_backward_compatibility.yaml b/.github/workflows/ph_backward_compatibility.yaml
@@ -12,36 +12,38 @@ defaults:
     shell: bash
 
 jobs:
-  platforms:
-    name: Run Platforms Workflow
-    uses: ./.github/workflows/platforms.yaml
+  platform-cache:
+    name: Platform Cache
+    uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@v1
     permissions:
-      packages: write
       contents: read
+      packages: write
+    with:
+      runs-on: '["self-hosted", "enf-x86-beefy"]'
+      platform-files: .cicd/platforms
 
   build-base:
     name: Run Build Workflow
     uses: ./.github/workflows/build_base.yaml
-    needs: [platforms]
+    needs: [platform-cache]
     with:
-      p: ${{needs.platforms.outputs.p}}
-      platform-matrix: ${{needs.platforms.outputs.platform-matrix}}
+      platforms: ${{needs.platform-cache.outputs.platforms}}
+      platform-list: ${{needs.platform-cache.outputs.platform-list}}
     permissions:
       packages: write
       contents: read
 
   tests:
     name: Tests
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{fromJSON(needs.platforms.outputs.platform-matrix)}}
+        platform: ${{fromJSON(needs.platform-cache.outputs.platform-list)}}
         release: [3.1, 3.2, 4.0]
     runs-on: ["self-hosted", "enf-x86-lowtier"]
     container:
-      image: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+      image: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
       options: --security-opt seccomp=unconfined
     steps:
       - uses: actions/checkout@v3
@@ -67,7 +69,8 @@ jobs:
           rm build/bin/cleos
           cp /usr/bin/nodeos build/bin
           cp /usr/bin/cleos build/bin
-          ./build/bin/nodeos --version
+          ./build/bin/nodeos --full-version
+          ./build/bin/cleos version full
       - if: ${{ matrix.release == '3.1' || matrix.release == '3.2' }}
         name: Run Performance Tests (<v4.0)
         run: |