difftreelog
Merge commit '3d43cce592db583beac33fb177927a1b15d448de' into release-v927020
in: master
11 files changed
.docker/Dockerfile-try-runtimediffbeforeafterboth--- /dev/null
+++ b/.docker/Dockerfile-try-runtime
@@ -0,0 +1,73 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+ARG RUST_TOOLCHAIN=
+
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
+ENV TZ=UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+
+RUN apt-get update && \
+ apt-get install -y curl cmake pkg-config libssl-dev git clang && \
+ apt-get clean && \
+ rm -r /var/lib/apt/lists/*
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+
+RUN rustup toolchain uninstall $(rustup toolchain list) && \
+ rustup toolchain install $RUST_TOOLCHAIN && \
+ rustup default $RUST_TOOLCHAIN && \
+ rustup target list --installed && \
+ rustup show
+RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+
+# ===== BUILD ======
+FROM rust-builder as builder-unique
+
+ARG PROFILE=release
+ARG FEATURE=
+ARG REPO_URL=
+ARG BRANCH=
+
+RUN git clone $REPO_URL -b $BRANCH . && \
+ cargo build --features=$FEATURE --$PROFILE
+
+
+# ===== BUILD POLKADOT =====
+FROM rust-builder as builder-polkadot
+
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
+
+RUN mkdir /unique_parachain
+WORKDIR /unique_parachain
+
+RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
+ cd polkadot && \
+ cargo build --release
+
+# ===== RUN ======
+
+FROM ubuntu:20.04
+
+ARG FORM_FROM=
+ARG FEATURE=
+
+RUN apt-get -y update && \
+ apt-get -y install curl git && \
+ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
+ export NVM_DIR="$HOME/.nvm" && \
+ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+ nvm install v16.16.0 && \
+ nvm use v16.16.0
+
+COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
\ No newline at end of file
.docker/docker-compose-try-runtime.ymldiffbeforeafterboth--- /dev/null
+++ b/.docker/docker-compose-try-runtime.yml
@@ -0,0 +1,19 @@
+version: "3.5"
+
+services:
+ try-runtime:
+ build:
+ context: ../
+ dockerfile: .docker/Dockerfile-try-runtime
+ image: try-runtime
+ container_name: try-runtime
+ expose:
+ - 9944
+ - 9933
+ ports:
+ - 127.0.0.1:9944:9944
+ - 127.0.0.1:9933:9933
+ logging:
+ options:
+ max-size: "1m"
+ max-file: "3"
.docker/docker-compose.try-runtime.j2diffbeforeafterboth--- /dev/null
+++ b/.docker/docker-compose.try-runtime.j2
@@ -0,0 +1,15 @@
+version: "3.5"
+
+services:
+ try-runtime:
+ build:
+ args:
+ - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+ - "BRANCH={{ BRANCH }}"
+ - "REPO_URL={{ REPO_URL }}"
+ - "FEATURE={{ FEATURE }}"
+ - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+ - "FORK_FROM={{ FORK_FROM }}"
+
+ command: cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
+
.github/workflows/build-test-master.ymldiffbeforeafterboth--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -10,6 +10,7 @@
- opened
- reopened
- synchronize #commit(s) pushed to the pull request
+ - ready_for_review
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
.github/workflows/codestyle.ymldiffbeforeafterboth--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -8,6 +8,7 @@
- opened
- reopened
- synchronize
+ - ready_for_review
jobs:
rustfmt:
.github/workflows/fork-update-withdata.ymldiffbeforeafterboth--- a/.github/workflows/fork-update-withdata.yml
+++ b/.github/workflows/fork-update-withdata.yml
@@ -10,6 +10,7 @@
- opened
- reopened
- synchronize #commit(s) pushed to the pull request
+ - ready_for_review
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -10,6 +10,7 @@
- opened
- reopened
- synchronize #commit(s) pushed to the pull request
+ - ready_for_review
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
.github/workflows/node_build_test.ymldiffbeforeafterboth1name: Develop - Build & test23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - develop9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request1314 # Allows you to run this workflow manually from the Actions tab15 workflow_dispatch:1617#Define Workflow variables18env:19 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2021# A workflow run is made up of one or more jobs that can run sequentially or in parallel22jobs:23 dev_build_test:24 # The type of runner that the job will run on25 runs-on: self-hosted-ci2627 name: Build Container, Spin it Up an test2829 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.3031 strategy:32 matrix:33 include:34 - network: "Opal"35 features: "opal-runtime"36 - network: "Quartz"37 features: "quartz-runtime"38 - network: "Unique"39 features: "unique-runtime"4041 steps:42 - name: Skip if pull request is in Draft43 # `if: github.event.pull_request.draft == true` should be kept here, at44 # the step level, rather than at the job level. The latter is not45 # recommended because when the PR is moved from "Draft" to "Ready to46 # review" the workflow will immediately be passing (since it was skipped),47 # even though it hasn't actually ran, since it takes a few seconds for48 # the workflow to start. This is also disclosed in:49 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1750 # That scenario would open an opportunity for the check to be bypassed:51 # 1. Get your PR approved52 # 2. Move it to Draft53 # 3. Push whatever commits you want54 # 4. Move it to "Ready for review"; now the workflow is passing (it was55 # skipped) and "Check reviews" is also passing (it won't be updated56 # until the workflow is finished)57 if: github.event.pull_request.draft == true58 run: exit 15960 - name: Clean Workspace61 uses: AutoModality/action-clean@v1.1.06263 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it64 - uses: actions/checkout@v365 with:66 ref: ${{ github.head_ref }} #Checking out head commit6768 - name: Read .env file69 uses: xom9ikk/dotenv@v1.0.27071 - name: Generate ENV related extend file for docker-compose72 uses: cuchi/jinja2-action@v1.2.073 with:74 template: .docker/docker-compose.tmp.j275 output_file: .docker/docker-compose.${{ matrix.network }}.yml76 variables: |77 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git78 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}79 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}80 FEATURE=${{ matrix.features }}81 BRANCH=${{ github.head_ref }}8283 - name: Show build configuration84 run: cat .docker/docker-compose.${{ matrix.network }}.yml8586 - name: Build the stack87 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8889 - uses: actions/setup-node@v390 with:91 node-version: 169293 - name: Run tests94 run: |95 cd tests96 yarn install97 yarn add mochawesome98 echo "Ready to start tests"99 node scripts/readyness.js100 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}101 env:102 RPC_URL: http://127.0.0.1:9933/103104 - name: Test Report105 uses: phoenix-actions/test-reporting@v8106 id: test-report107 if: success() || failure() # run this step even if previous step failed108 with:109 name: Tests ${{ matrix.network }} # Name of the check run which will be created110 path: tests/mochawesome-report/test-*.json # Path to test results111 reporter: mochawesome-json112 fail-on-error: 'false'113114 - name: Read output variables115 run: |116 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"117118 - name: Stop running containers119 if: always() # run this step always120 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down1name: Develop - Build & test23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - develop9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request13 - ready_for_review1415 # Allows you to run this workflow manually from the Actions tab16 workflow_dispatch:1718#Define Workflow variables19env:20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:24 dev_build_test:25 # The type of runner that the job will run on26 runs-on: self-hosted-ci2728 name: Build Container, Spin it Up an test2930 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.3132 strategy:33 matrix:34 include:35 - network: "Opal"36 features: "opal-runtime"37 - network: "Quartz"38 features: "quartz-runtime"39 - network: "Unique"40 features: "unique-runtime"4142 steps:43 - name: Skip if pull request is in Draft44 # `if: github.event.pull_request.draft == true` should be kept here, at45 # the step level, rather than at the job level. The latter is not46 # recommended because when the PR is moved from "Draft" to "Ready to47 # review" the workflow will immediately be passing (since it was skipped),48 # even though it hasn't actually ran, since it takes a few seconds for49 # the workflow to start. This is also disclosed in:50 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1751 # That scenario would open an opportunity for the check to be bypassed:52 # 1. Get your PR approved53 # 2. Move it to Draft54 # 3. Push whatever commits you want55 # 4. Move it to "Ready for review"; now the workflow is passing (it was56 # skipped) and "Check reviews" is also passing (it won't be updated57 # until the workflow is finished)58 if: github.event.pull_request.draft == true59 run: exit 16061 - name: Clean Workspace62 uses: AutoModality/action-clean@v1.1.06364 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it65 - uses: actions/checkout@v366 with:67 ref: ${{ github.head_ref }} #Checking out head commit6869 - name: Read .env file70 uses: xom9ikk/dotenv@v1.0.27172 - name: Generate ENV related extend file for docker-compose73 uses: cuchi/jinja2-action@v1.2.074 with:75 template: .docker/docker-compose.tmp.j276 output_file: .docker/docker-compose.${{ matrix.network }}.yml77 variables: |78 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git79 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}80 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}81 FEATURE=${{ matrix.features }}82 BRANCH=${{ github.head_ref }}8384 - name: Show build configuration85 run: cat .docker/docker-compose.${{ matrix.network }}.yml8687 - name: Build the stack88 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8990 - uses: actions/setup-node@v391 with:92 node-version: 169394 - name: Run tests95 run: |96 cd tests97 yarn install98 yarn add mochawesome99 echo "Ready to start tests"100 node scripts/readyness.js101 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}102 env:103 RPC_URL: http://127.0.0.1:9933/104105 - name: Test Report106 uses: phoenix-actions/test-reporting@v8107 id: test-report108 if: success() || failure() # run this step even if previous step failed109 with:110 name: Tests ${{ matrix.network }} # Name of the check run which will be created111 path: tests/mochawesome-report/test-*.json # Path to test results112 reporter: mochawesome-json113 fail-on-error: 'false'114115 - name: Read output variables116 run: |117 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"118119 - name: Stop running containers120 if: always() # run this step always121 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down.github/workflows/tests_codestyle.ymldiffbeforeafterboth--- a/.github/workflows/tests_codestyle.yml
+++ b/.github/workflows/tests_codestyle.yml
@@ -8,6 +8,8 @@
- opened
- reopened
- synchronize
+ - ready_for_review
+
jobs:
code_style:
runs-on: self-hosted-ci
.github/workflows/try-runtime.ymldiffbeforeafterboth--- /dev/null
+++ b/.github/workflows/try-runtime.yml
@@ -0,0 +1,117 @@
+name: Try Runtime
+
+# Controls when the action will run.
+on:
+ # Triggers the workflow on push or pull request events but only for the master branch
+ pull_request:
+ branches:
+ - master
+ types:
+ - opened
+ - reopened
+ - synchronize #commit(s) pushed to the pull request
+ - ready_for_review
+
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+#Define Workflow variables
+env:
+ REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+ fork-update-withdata:
+ # The type of runner that the job will run on
+ runs-on: self-hosted-ci
+
+ name: Build Container, Spin it Up an test
+
+ continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.
+
+ strategy:
+ matrix:
+ include:
+ - network: Opal
+ features: try-runtime,opal-runtime
+ fork_from_address: wss://eu-ws-opal.unique.network:443
+ - network: Quartz
+ features: try-runtime,quartz-runtime
+ fork_from_address: wss://eu-ws-quartz.unique.network:443
+ - network: Unique
+ features: try-runtime,unique-runtime
+ fork_from_address: wss://eu-ws.unique.network:443
+
+ steps:
+# - name: Skip if pull request is in Draft
+ # `if: github.event.pull_request.draft == true` should be kept here, at
+ # the step level, rather than at the job level. The latter is not
+ # recommended because when the PR is moved from "Draft" to "Ready to
+ # review" the workflow will immediately be passing (since it was skipped),
+ # even though it hasn't actually ran, since it takes a few seconds for
+ # the workflow to start. This is also disclosed in:
+ # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+ # That scenario would open an opportunity for the check to be bypassed:
+ # 1. Get your PR approved
+ # 2. Move it to Draft
+ # 3. Push whatever commits you want
+ # 4. Move it to "Ready for review"; now the workflow is passing (it was
+ # skipped) and "Check reviews" is also passing (it won't be updated
+ # until the workflow is finished)
+# if: github.event.pull_request.draft == true
+# run: exit 1
+
+
+ - name: Clean Workspace
+ uses: AutoModality/action-clean@v1.1.0
+
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v3
+ with:
+ ref: ${{ github.head_ref }} #Checking out head commit
+
+ - name: Read .env file
+ uses: xom9ikk/dotenv@v1.0.2
+
+ - name: Generate ENV related extend file for docker-compose
+ uses: cuchi/jinja2-action@v1.2.0
+ with:
+ template: .docker/docker-compose.try-runtime.j2
+ output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
+ variables: |
+ REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
+ RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
+ POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+ FEATURE=${{ matrix.features }}
+ BRANCH=${{ github.head_ref }}
+ FORK_FROM=${{ matrix.fork_from_address }}
+
+ - name: Show build configuration
+ run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
+
+
+ - name: Build the stack
+ run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up -d --build --force-recreate --timeout 300
+
+
+ - name: Collect Docker Logs
+ if: success() || failure()
+ uses: jwalton/gh-docker-logs@v2.2.0
+ with:
+ dest: './try-runtime-logs.${{ matrix.features }}'
+ images: 'try-runtime'
+
+ - name: Tar logs
+ if: success() || failure()
+ run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}
+
+ - name: Upload logs to GitHub
+ if: success() || failure()
+ uses: actions/upload-artifact@master
+ with:
+ name: try-runtime-logs.${{ matrix.features }}.tgz
+ path: ./try-runtime-logs.${{ matrix.features }}.tgz
+
+ - name: Stop running containers
+ if: always() # run this step always
+ run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -717,13 +717,13 @@
#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
- fn on_runtime_upgrade() -> (Weight, Weight) {
+ fn on_runtime_upgrade() -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {
log::info!("try-runtime::on_runtime_upgrade unique-chain.");
let weight = Executive::try_runtime_upgrade().unwrap();
- (weight, RuntimeBlockWeights::get().max_block)
+ (weight, crate::config::substrate::RuntimeBlockWeights::get().max_block)
}
- fn execute_block_no_check(block: Block) -> Weight {
+ fn execute_block_no_check(block: Block) -> frame_support::pallet_prelude::Weight {
Executive::execute_block_no_check(block)
}
}