Merge remote-tracking branch 'origin/master' into av/wasm-gen-recursions

gear-tech · Oct 20, 2023 · fbb7208 · fbb7208
2 parents 1517c20 + 684cc76
commit fbb7208
Show file tree

Hide file tree

Showing 180 changed files with 4,074 additions and 9,800 deletions.
diff --git a/.github/workflows/CI-docker-gear.yml b/.github/workflows/CI-docker-gear.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: [kuberunner]
     steps:
       - uses: actions/checkout@v4
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
 
       - uses: actions/cache@v3
         with:
@@ -25,7 +25,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-gear
 
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -38,7 +38,7 @@ jobs:
             echo "DOCKER_TAGS=ghcr.io/gear-tech/node:latest,ghcr.io/gear-tech/node:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
           fi
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
           file: ./docker/Dockerfile-release
           push: true

diff --git a/.github/workflows/Update-Vara-Prod.yml b/.github/workflows/Update-Vara-Prod.yml
@@ -27,21 +27,21 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Vara-Dockerfile

diff --git a/.github/workflows/Update-testnet.yml b/.github/workflows/Update-testnet.yml
@@ -30,18 +30,18 @@ jobs:
         run: echo ${{ needs.tag-image.outputs.image_tag }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -39,12 +39,10 @@ jobs:
 
       - name: Run all benchmarks
         run: |
-          ./scripts/benchmarking/run_all_benchmarks.sh -c gear-dev -m
-          cp ./scripts/benchmarking/weights-output/* runtime/gear/src/weights
-          ./scripts/benchmarking/run_all_benchmarks.sh -b -c vara-dev -m # -b to skip build
+          ./scripts/benchmarking/run_all_benchmarks.sh -c vara-dev -m
           cp ./scripts/benchmarking/weights-output/* runtime/vara/src/weights
           # apply some patches for `pallets/gear/src/weights.rs`
-          cp runtime/gear/src/weights/pallet_gear.rs pallets/gear/src/weights.rs
+          cp runtime/vara/src/weights/pallet_gear.rs pallets/gear/src/weights.rs
           sed -i -E 's/\w+::WeightInfo for SubstrateWeight/WeightInfo for SubstrateWeight/' pallets/gear/src/weights.rs
           # clear the target directory because our benchmarking machine is not ephemeral
           cargo clean
@@ -57,12 +55,6 @@ jobs:
           path: scripts/benchmarking/benchmarking_errors.txt
           if-no-files-found: ignore
 
-      - name: "ACTIONS: Upload artifact with updated weights (gear)"
-        uses: actions/upload-artifact@v3
-        with:
-          name: weights-gear
-          path: runtime/gear/src/weights/
-
       - name: "ACTIONS: Upload artifact with updated weights (vara)"
         uses: actions/upload-artifact@v3
         with:
@@ -75,19 +67,18 @@ jobs:
 
       - name: Create commit
         if: ${{ inputs.change-type == 'commit' }}
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: >-
             chore(runtime): update weights
-          file_pattern: "pallets/gear/src/ runtime/gear/src/weights/ runtime/vara/src/weights/"
+          file_pattern: "pallets/gear/src/ runtime/vara/src/weights/"
 
       - name: Create Pull Request
         if: ${{ inputs.change-type == 'pull_request' }}
         uses: peter-evans/create-pull-request@v5
         with:
           add-paths: |
             pallets/gear/src/
-            runtime/gear/src/weights/
             runtime/vara/src/weights/
           commit-message: update weights
           branch: weights/patch
@@ -96,4 +87,4 @@ jobs:
             chore(runtime): update weights
           body: |
             `run_all_benchmarks.sh` script is applied to update weights (branch: `${{ github.ref_name }}`, commit ${{ github.sha }})
-            **Note:** If CI fails, try manually updating the heuristic tests: `runtime/{gear, vara}/src/tests.rs`
+            **Note:** If CI fails, try manually updating the heuristic tests: `runtime/vara/src/tests.rs`
diff --git a/.github/workflows/build-node-fuzzer.yaml b/.github/workflows/build-node-fuzzer.yaml
@@ -22,10 +22,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the github container registry
         uses: docker/login-action@master

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,9 +71,6 @@ jobs:
       - name: "Build fuzzer"
         run: ./scripts/gear.sh build fuzz --locked --release
 
-      - name: "Check: Gear runtime imports"
-        run: ./target/release/wasm-proc --check-runtime-imports target/release/wbuild/gear-runtime/gear_runtime.compact.wasm
-
       - name: "Check: Vara runtime imports"
         run: ./target/release/wasm-proc --check-runtime-imports target/release/wbuild/vara-runtime/vara_runtime.compact.wasm
 
@@ -164,9 +161,6 @@ jobs:
           cd target/wasm32-unknown-unknown/release
           tar czvf ../../../artifact/examples.tar.gz *.wasm
           cd ../../..
-          cp target/production/wbuild/gear-runtime/gear_runtime.compact.compressed.wasm artifact/
-          cp target/production/wbuild/gear-runtime/gear_runtime.compact.wasm artifact/
-          cp target/production/wbuild/gear-runtime/gear_runtime.wasm artifact/
           cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm artifact/
           cp target/production/wbuild/vara-runtime/vara_runtime.compact.wasm artifact/
           cp target/production/wbuild/vara-runtime/vara_runtime.wasm artifact/

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -71,7 +71,7 @@ jobs:
     steps:
       - name: Cancel Previous Runs
         if: ${{ github.event_name == 'pull_request' }}
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.0
         with:
           access_token: ${{ github.token }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,6 @@ jobs:
 
       - name: "Environment: Export versions"
         run: |
-          echo "GEAR_SPEC=$(cat runtime/gear/src/lib.rs | grep "spec_version: " | awk -F " " '{print substr($2, 1, length($2)-1)}')" >> $GITHUB_ENV
           echo "VARA_SPEC=$(cat runtime/vara/src/lib.rs | grep "spec_version: " | awk -F " " '{print substr($2, 1, length($2)-1)}')" >> $GITHUB_ENV
 
       - name: "Environment: Make `artifact` directory"
@@ -79,27 +78,23 @@ jobs:
       - name: "Build: Production `vara-runtime`"
         run: cargo build -p vara-runtime --profile production --no-default-features --features std
 
-      - name: "Test: Production `vara-runtime`"
-        run: ./wasm-proc --check-runtime-imports target/production/wbuild/vara-runtime/vara_runtime.wasm
-
       - name: "Artifact: Production `vara-runtime`"
         run: cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/vara_runtime_v$VARA_SPEC.wasm"
 
       - name: "Build: Production node with development runtimes"
         run: cargo build -p gear-cli --profile production
 
-      - name: "Test: Development runtimes"
-        run: |
-          ./wasm-proc --check-runtime-imports target/production/wbuild/gear-runtime/gear_runtime.wasm
-          ./wasm-proc --check-runtime-imports target/production/wbuild/vara-runtime/vara_runtime.wasm
-
-      - name: "Artifact: Production node and development runtimes"
+      - name: "Artifact: Production node client and development `vara-runtime`"
         run: |
-          cp target/production/wbuild/gear-runtime/gear_runtime.compact.compressed.wasm "artifact/gear_devruntime_v$GEAR_SPEC.wasm"
           cp target/production/wbuild/vara-runtime/vara_runtime.compact.compressed.wasm "artifact/vara_devruntime_v$VARA_SPEC.wasm"
           cp target/production/gear artifact/gear
           strip artifact/gear || true
 
+      - name: "Test: Runtimes"
+        run: |
+          ./wasm-proc --check-runtime-imports --check-runtime-is-dev false "artifact/vara_runtime_v$VARA_SPEC.wasm"
+          ./wasm-proc --check-runtime-imports --check-runtime-is-dev true  "artifact/vara_devruntime_v$VARA_SPEC.wasm"
+
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -36,18 +36,18 @@ jobs:
         run: echo ${{ needs.tag-image.outputs.image_tag }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/Dockerfile