Merge pull request #9 from Snowfork/alistair/merge-from-adrian

Merge from Reserve Transfer Branch

.github/review-bot.yml

@@ -118,3 +118,7 @@ rules:
       - minApprovals: 1
         teams:
           - ci
+
+preventReviewRequests:
+  teams:
+    - core-devs

.github/workflows/build-and-attach-release-runtimes.yml

@@ -0,0 +1,69 @@
+name: Build and Attach Runtimes to Releases/RC
+
+on:
+  release:
+    types:
+      - created
+
+env:
+  PROFILE: production
+
+jobs:
+  build_and_upload:
+    strategy:
+      matrix:
+        runtime:
+          - { name: westend, package: westend-runtime, path: polkadot/runtime/westend }
+          - { name: rococo, package: rococo-runtime, path: polkadot/runtime/rococo }
+          - { name: asset-hub-rococo, package: asset-hub-rococo-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-rococo }
+          - { name: asset-hub-westend, package: asset-hub-westend-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-westend }
+          - { name: bridge-hub-rococo, package: bridge-hub-rococo-runtime, path: cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo }
+          - { name: contracts-rococo, package: contracts-rococo-runtime, path: cumulus/parachains/runtimes/contracts/contracts-rococo }
+        build_config:
+          # Release build has logging disabled and no dev features
+          - { type: on-chain-release, opts: --features on-chain-release-build } 
+          # Debug build has logging enabled and developer features
+          - { type: dev-debug-build, opts: --features try-runtime }
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Build ${{ matrix.runtime.name }} ${{ matrix.build_config.type }}
+      id: srtool_build
+      uses: chevdor/[email protected]
+      env:
+        BUILD_OPTS: ${{ matrix.build_config.opts }}
+      with:
+        chain: ${{ matrix.runtime.name }}
+        package: ${{ matrix.runtime.package }}
+        runtime_dir: ${{ matrix.runtime.path }}
+        profile: ${{ env.PROFILE }}
+
+    - name: Build Summary
+      run: |
+        echo "${{ steps.srtool_build.outputs.json }}" | jq . > ${{ matrix.runtime.name }}-srtool-digest.json
+        cat ${{ matrix.runtime.name }}-srtool-digest.json
+        echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
+
+    - name: Set up paths and runtime names
+      id: setup
+      run: |
+        RUNTIME_BLOB_NAME=$(echo ${{ matrix.runtime.package }} | sed 's/-/_/g').compact.compressed.wasm
+        PREFIX=${{ matrix.build_config.type == 'dev-debug-build' && 'DEV_DEBUG_BUILD__' || '' }}
+
+        echo "RUNTIME_BLOB_NAME=$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+        echo "ASSET_PATH=./${{ matrix.runtime.path }}/target/srtool/${{ env.PROFILE }}/wbuild/${{ matrix.runtime.package }}/$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+        echo "ASSET_NAME=$PREFIX$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
+
+    - name: Upload Runtime to Release
+      uses: actions/upload-release-asset@v1
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ${{ env.ASSET_PATH }}
+        asset_name: ${{ env.ASSET_NAME }}
+        asset_content_type: application/octet-stream
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-publish.yml

@@ -0,0 +1,28 @@
+name: Check publish
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  check-publish:
+    strategy:
+      matrix:
+        os: ["ubuntu-latest"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
+        with:
+          cache-on-failure: true
+
+      - name: install parity-publish
+        run: cargo install parity-publish --profile dev
+
+      - name: parity-publish check
+        run: parity-publish check --allow-unpublished

.github/workflows/fmt-check.yml

@@ -14,7 +14,7 @@ jobs:
         os: ["ubuntu-latest"]
     runs-on: ${{ matrix.os }}
     container:
-      image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
+      image: paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231025
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 

.github/workflows/review-bot.yml

@@ -6,28 +6,27 @@ on:
     types:
       - completed
 
-permissions:
-  contents: read
-
 jobs:
   review-approvals:
     runs-on: ubuntu-latest
+    environment: master
     steps:
       - name: Extract content of artifact
         id: number
         uses: Bullrich/[email protected]
         with:
           artifact-name: pr_number
       - name: Generate token
-        id: team_token
+        id: app_token
         uses: tibdex/github-app-token@v1
         with:
           app_id: ${{ secrets.REVIEW_APP_ID }}
           private_key: ${{ secrets.REVIEW_APP_KEY }}
       - name: "Evaluates PR reviews and assigns reviewers"
-        uses: paritytech/review-bot@v2.1.0
+        uses: paritytech/review-bot@v2.2.0
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          team-token: ${{ steps.team_token.outputs.token }}
-          checks-token: ${{ steps.team_token.outputs.token }}
+          repo-token: ${{ steps.app_token.outputs.token }}
+          team-token: ${{ steps.app_token.outputs.token }}
+          checks-token: ${{ steps.app_token.outputs.token }}
           pr-number: ${{ steps.number.outputs.content }}
+          request-reviewers: true

.gitlab-ci.yml

@@ -30,7 +30,7 @@ variables:
   RUSTY_CACHIER_COMPRESSION_METHOD: zstd
   NEXTEST_FAILURE_OUTPUT: immediate-final
   NEXTEST_SUCCESS_OUTPUT: final
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.71"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.75"
   DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
 
 default:

.gitlab/check-each-crate.py

@@ -19,7 +19,11 @@
 crates = []
 for line in output.splitlines():
 	if line != b"":
-		crates.append(line.decode('utf8').split(" ")[0])
+		line = line.decode('utf8').split(" ")
+		crate_name = line[0]
+		# The crate path is always the last element in the line.
+		crate_path = line[len(line) - 1].replace("(", "").replace(")", "")
+		crates.append((crate_name, crate_path))
 
 # Make the list unique and sorted
 crates = list(set(crates))
@@ -49,9 +53,9 @@
 for i in range(0, crates_per_group + overflow_crates):
 	crate = crates_per_group * target_group + i
 
-	print(f"Checking {crates[crate]}", file=sys.stderr)
+	print(f"Checking {crates[crate][0]}", file=sys.stderr)
 
-	res = subprocess.run(["cargo", "check", "--locked", "-p", crates[crate]])
+	res = subprocess.run(["cargo", "check", "--locked"], cwd = crates[crate][1])
 
 	if res.returncode != 0:
 		sys.exit(1)

.gitlab/pipeline/build.yml

@@ -305,7 +305,7 @@ build-linux-substrate:
     # see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
     - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
   script:
-    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p node-cli
+    - WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p staging-node-cli
     - mv $CARGO_TARGET_DIR/release/substrate-node ./artifacts/substrate/substrate
     - echo -n "Substrate version = "
     - if [ "${CI_COMMIT_TAG}" ]; then

.gitlab/pipeline/check.yml

@@ -107,7 +107,7 @@ check-rust-feature-propagation:
       echo "---------- Building ${PACKAGE} runtime ----------"
       time cargo build --release --locked -p "$PACKAGE" --features try-runtime
 
-      echo "---------- Executing `on-runtime-upgrade` for ${NETWORK} ----------"
+      echo "---------- Executing on-runtime-upgrade for ${NETWORK} ----------"
       time ./try-runtime \
           --runtime ./target/release/wbuild/"$PACKAGE"/"$WASM" \
           on-runtime-upgrade --checks=pre-and-post ${EXTRA_ARGS} live --uri ${URI}

.gitlab/pipeline/test.yml

@@ -352,7 +352,7 @@ quick-benchmarks:
     WASM_BUILD_NO_COLOR: 1
     WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
   script:
-    - time cargo run --locked --release -p node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - time cargo run --locked --release -p staging-node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --execution wasm --wasm-execution compiled --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 test-frame-examples-compile-to-wasm:
   # into one job
@@ -396,7 +396,7 @@ test-linux-stable-int:
   script:
     - WASM_BUILD_NO_COLOR=1
       RUST_LOG=sync=trace,consensus=trace,client=trace,state-db=trace,db=trace,forks=trace,state_db=trace,storage_cache=trace
-      time cargo test -p node-cli --release --locked -- --ignored
+      time cargo test -p staging-node-cli --release --locked -- --ignored
 
 # more information about this job can be found here:
 # https://github.com/paritytech/substrate/pull/6916