git.delta.rocks / unique-network / refs/commits / 6aa08763e9bf

difftreelog

Merge commit '3d43cce592db583beac33fb177927a1b15d448de' into release-v927020

Yaroslav Bolyukin2022-08-16parents: #4cfc421 #3d43cce.patch.diff
in: master

11 files changed

added.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
added.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"
added.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
+
modified.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:
modified.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:
modified.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:
modified.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:
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.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:
modified.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
added.github/workflows/try-runtime.ymldiffbeforeafterboth
after · .github/workflows/try-runtime.yml
1name: Try Runtime23# 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      - master9    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  fork-update-withdata: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: Opal36            features: try-runtime,opal-runtime37            fork_from_address: wss://eu-ws-opal.unique.network:44338          - network: Quartz39            features: try-runtime,quartz-runtime40            fork_from_address: wss://eu-ws-quartz.unique.network:44341          - network: Unique42            features: try-runtime,unique-runtime43            fork_from_address: wss://eu-ws.unique.network:4434445    steps:46#      - name: Skip if pull request is in Draft47        # `if: github.event.pull_request.draft == true` should be kept here, at48        # the step level, rather than at the job level. The latter is not49        # recommended because when the PR is moved from "Draft" to "Ready to50        # review" the workflow will immediately be passing (since it was skipped),51        # even though it hasn't actually ran, since it takes a few seconds for52        # the workflow to start. This is also disclosed in:53        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1754        # That scenario would open an opportunity for the check to be bypassed:55        # 1. Get your PR approved56        # 2. Move it to Draft57        # 3. Push whatever commits you want58        # 4. Move it to "Ready for review"; now the workflow is passing (it was59        #    skipped) and "Check reviews" is also passing (it won't be updated60        #    until the workflow is finished)61#        if: github.event.pull_request.draft == true62#        run: exit 1636465      - name: Clean Workspace66        uses: AutoModality/action-clean@v1.1.06768      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it69      - uses: actions/checkout@v370        with:71          ref: ${{ github.head_ref }}  #Checking out head commit7273      - name: Read .env file74        uses: xom9ikk/dotenv@v1.0.27576      - name: Generate ENV related extend file for docker-compose77        uses: cuchi/jinja2-action@v1.2.078        with:79          template: .docker/docker-compose.try-runtime.j280          output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml81          variables: |82            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git83            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}84            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}85            FEATURE=${{ matrix.features }}86            BRANCH=${{ github.head_ref }}87            FORK_FROM=${{ matrix.fork_from_address }}8889      - name: Show build configuration90        run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml919293      - name: Build the stack94        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 300959697      - name: Collect Docker Logs98        if: success() || failure()99        uses: jwalton/gh-docker-logs@v2.2.0100        with:101          dest: './try-runtime-logs.${{ matrix.features }}'102          images: 'try-runtime' 103104      - name: Tar logs105        if: success() || failure()106        run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}107108      - name: Upload logs to GitHub109        if: success() || failure()110        uses: actions/upload-artifact@master111        with:112          name: try-runtime-logs.${{ matrix.features }}.tgz113          path: ./try-runtime-logs.${{ matrix.features }}.tgz114115      - name: Stop running containers116        if: always()                   # run this step always117        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
modifiedruntime/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)
                 }
             }