Merge astar-frame (#957)

* Merge astar-frame. * Fix compiling. * Update license check workflow. * Code coverage workflow. * Add runtime deps to workspace. * Deps fix: integration tests and collator needs runtime std. * Fix license check CI. * Cancel previous workflow runs on new PR push. * Run tests coverage on self-hosted. * Revert. * Add coverage excludes. * Code coverage has different trigger conditions. * Update code coverage args. * Cancel previous code coverage run on new job.
AstarNetwork · Jun 19, 2023 · 5187393 · 5187393
1 parent 24df29c
commit 5187393
Show file tree

Hide file tree

Showing 169 changed files with 36,265 additions and 377 deletions.
diff --git a/.github/license-check/config.json b/.github/license-check/config.json
@@ -3,6 +3,19 @@
         "include": [
             "**/*.rs"
         ],
+        "exclude": [
+            "pallets/collator-selection/**",
+            "pallets/custom-signatures/**",
+            "precompiles/utils/**",
+            "vendor/**"
+        ],
         "license": "./.github/license-check/headers/HEADER-GNUv3"
+    },
+    {
+        "include": [
+            "pallets/collator-selection/*.rs",
+            "pallets/custom-signatures/*.rs"
+        ],
+        "license": "./.github/license-check/headers/HEADER-APACHE2"
     }
 ]
diff --git a/.github/license-check/headers/HEADER-APACHE2 b/.github/license-check/headers/HEADER-APACHE2
@@ -0,0 +1,16 @@
+// This file is part of Astar.
+
+// Copyright (C) 2019-2023 Stake Technologies Pte.Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
diff --git a/.github/scripts/generate-release-body.ts b/.github/scripts/generate-release-body.ts
@@ -255,7 +255,7 @@ async function main() {
     getRuntimeInfo(argv["srtool-report-folder"], runtimeName)
   );
 
-  const moduleLinks = ["substrate", "polkadot", "cumulus", "frontier", "astar-frame"].map((repoName) => ({
+  const moduleLinks = ["substrate", "polkadot", "cumulus", "frontier"].map((repoName) => ({
     name: repoName,
     link: getCompareLink(repoName, previousTag, newTag),
   }));
@@ -339,7 +339,7 @@ ${moduleLinks.map((modules) => `${capitalize(modules.name)}: ${modules.link}`).j
 | \`Ubuntu x86_64\` | [Download](https://github.com/AstarNetwork/Astar/releases/download/${newTag}/astar-collator-${newTag}-ubuntu-x86_64.tar.gz) |
 | \`Ubuntu aarch64\` | [Download](https://github.com/AstarNetwork/Astar/releases/download/${newTag}/astar-collator-${newTag}-ubuntu-aarch64.tar.gz) |
 
-[<img src="https://github.com/AstarNetwork/Astar/blob/master/.github/images/docker.webp" height="200px">](https://hub.docker.com/r/staketechnologies/astar-collator/tags) 
+[<img src="https://github.com/AstarNetwork/Astar/blob/master/.github/images/docker.webp" height="200px">](https://hub.docker.com/r/staketechnologies/astar-collator/tags)
 `
 
   console.log(template);

diff --git a/.github/workflows/base_checks.yaml b/.github/workflows/base_checks.yaml
@@ -7,6 +7,16 @@ on:
     - v[0-9]+.[0-9]+.[0-9]+*
   workflow_dispatch:
 jobs:
+  clean-up-actions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        # Only cancel non-master branch runs
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{ github.token }}
+
   compile-and-check:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -0,0 +1,74 @@
+name: Code coverage
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
+  workflow_dispatch:
+jobs:
+  clean-up-actions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        # Only cancel non-master branch runs
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{ github.token }}
+
+  coverage:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@v3
+
+    - name: Install & display rust toolchain
+      run: rustup show
+
+    - name: Check targets are installed correctly
+      run: rustup target list --installed
+
+    - uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target/
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+
+    - name: Install deps
+      run: sudo apt -y install protobuf-compiler
+
+    - name: Run all tests & Generate report
+      uses: actions-rs/tarpaulin@v0.1
+      with:
+        version: 0.22.0
+        args: '--workspace -e astar-collator xcm-tools local-runtime shibuya-runtime shiden-runtime astar-runtime integration-tests --exclude-files vendor/* bin/* runtime/* tests/* **/mock.rs **/weights.rs'
+        out-type: Xml
+
+    - name: Code Coverage Summary Report
+      uses: irongut/CodeCoverageSummary@v1.2.0
+      with:
+        filename: cobertura.xml
+        badge: true
+        fail_below_min: true
+        format: markdown
+        hide_branch_rate: false
+        hide_complexity: true
+        indicators: true
+        output: both
+        thresholds: '50 80'
+
+    - name: Add Coverage PR Comment
+      uses: marocchino/sticky-pull-request-comment@v2
+      if: github.event_name == 'pull_request'
+      with:
+        recreate: true
+        path: code-coverage-results.md
+
+    - name: Archive code coverage results
+      uses: actions/upload-artifact@v1
+      with:
+        name: code-coverage-report
+        path: cobertura.xml
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,6 +1,16 @@
 name: Static Analysis
 on: [push, workflow_dispatch]
 jobs:
+  clean-up-actions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        # Only cancel non-master branch runs
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{ github.token }}
+
   fmt:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -64,7 +74,7 @@ jobs:
       - name: Checkout the source code
         uses: actions/checkout@v3
 
-      - name: Check license    
+      - name: Check license
         uses: viperproject/check-license-header@v2
         with:
           path: ./

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,17 @@ on:
     - v[0-9]+.[0-9]+.[0-9]+*
   workflow_dispatch:
 jobs:
-  run-tests:
+  clean-up-actions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        # Only cancel non-master branch runs
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          access_token: ${{ github.token }}
+
+  test-runtimes:
     runs-on: ubuntu-latest
     steps:
     - name: Free disk space

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,10 +12,6 @@ We welcome any types of contributions that can improve the project/network in an
 
 The Astar Network project uses GitHub as the main source control hosting service. Most forms of communication regarding changes to the code will be done within the issue board of the repository.
 
-The core of Astar Network codebase is split into two repositories:
-* [Astar](https://github.com/AstarNetwork/Astar)
-* [astar-frame](https://github.com/AstarNetwork/astar-frame)
-
 ### Opening an Issue
 
 Contributions within GitHub can take on the following forms:
@@ -32,7 +28,7 @@ In short:
 
 1. Open an issue regarding a bug fix or feature request (fill in our issue templates)
 2. Briefly describe how you plan to make changes to the code
-3. Fork the current default branch on _Astar_ or _astar-frame_ or both (depending on where you need to make changes)
+3. Fork the current default branch on _Astar_.
 4. Open a pull request to the default branch (fill in our pull request template) and add the appropriate label.
 5. Ensure all workflow checks have passed
 6. Wait for the maintainers approval or change requests
@@ -75,7 +71,7 @@ The expected flow is:
 
 ### Contributor Licenses
 
-By contributing, you agree that your contributions will be licensed under the [GNU General Public License v3.0](https://github.com/AstarNetwork/astar-frame/blob/polkadot-v0.9.19/LICENSE) as is with the Astar source code. If you have any concerns regarding this matter, please contact the maintainer.
+By contributing, you agree that your contributions will be licensed under the [GNU General Public License v3.0](https://github.com/AstarNetwork/Astar/blob/master/LICENSE) as is with the Astar source code. If you have any concerns regarding this matter, please contact the maintainer.
 
 ## Community Contribution