difftreelog
Fixing state by the end if day.
in: master
6 files changed
.docker/Dockerfile-parachain-upgradediffbeforeafterboth1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14 apt-get install -y cmake curl pkg-config libssl-dev git clang && \15 apt-get clean && \16 rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21 rustup toolchain install $RUST_TOOLCHAIN && \22 rustup default $RUST_TOOLCHAIN && \23 rustup target list --installed && \24 rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN262728#RUN mkdir /unique_parachain29#WORKDIR /unique_parachain303132# ===== BUILD current version ======33FROM rust-builder as builder-unique-current3435ARG PROFILE=release36ARG FEATURE=37ARG MAINNET_BRANCH=38ARG REPO_URL=3940RUN mkdir /unique_parachain41WORKDIR /unique_parachain4243RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL"44RUN git clone $REPO_URL -b $MAINNET_BRANCH .45RUN cargo build $FEATURE --$PROFILE464748# ===== BUILD target version ======49FROM rust-builder as builder-unique-target5051ARG PROFILE=release52ARG FEATURE=53ARG BRANCH=54ARG REPO_URL=5556RUN mkdir /unique_parachain57WORKDIR /unique_parachain5859RUN git clone $REPO_URL -b $BRANCH .60RUN cargo build $FEATURE --$PROFILE6162COPY /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json636465# ===== BUILD POLKADOT =====66FROM rust-builder as builder-polkadot6768ARG POLKADOT_BUILD_BRANCH=69ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH7071RUN mkdir /unique_parachain72WORKDIR /unique_parachain7374RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \75 cd polkadot && \76 cargo build --release7778# ===== RUN ======7980FROM ubuntu:20.048182RUN apt-get -y update && \83 apt-get -y install curl git && \84 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \85 export NVM_DIR="$HOME/.nvm" && \86 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \87 nvm install v16.16.0 && \88 nvm use v16.16.08990RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing9192RUN export NVM_DIR="$HOME/.nvm" && \93 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \94 cd /polkadot-launch && \95 npm install --global yarn && \96 yarn install9798COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/99COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/100COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/101102COPY --from=builder-unique-target /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json103104105CMD export NVM_DIR="$HOME/.nvm" && \106 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \107 cd /polkadot-launch && \108 yarn start launch-config.json --test-upgrade.docker/docker-compose-forkless.yamldiffbeforeafterboth--- a/.docker/docker-compose-forkless.yaml
+++ b/.docker/docker-compose-forkless.yaml
@@ -7,6 +7,8 @@
dockerfile: .docker/Dockerfile-parachain-upgrade
image: node-parachain
container_name: node-parachain
+ volumes:
+ - .docker/launch-config-forkless.json:/polkadot-launch/launch-config.json
expose:
- 9944
- 9933
.docker/launch-config.j2diffbeforeafterboth--- /dev/null
+++ b/.docker/launch-config.j2
@@ -0,0 +1,40 @@
+{
+ "parachains": [
+ {
+ "bin": "../unique-chain/current/release/unique-collator",
+ "upgradeBin": "../unique-chain/target/release/unique-collator",
+ "upgradeWasm": "../unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
+ "id": "1000",
+ "balance": "1000000000000000000000000",
+ "nodes": [
+ {
+ "port": 31200,
+ "wsPort": 9944,
+ "rpcPort": 9933,
+ "name": "alice",
+ "flags": [
+ "--rpc-cors=all",
+ "--unsafe-rpc-external",
+ "--unsafe-ws-external",
+ "-lxcm=trace"
+ ]
+ },
+ {
+ "port": 31201,
+ "wsPort": 9945,
+ "rpcPort": 9934,
+ "name": "bob",
+ "flags": [
+ "--rpc-cors=all",
+ "--unsafe-rpc-external",
+ "--unsafe-ws-external",
+ "-lxcm=trace"
+ ]
+ }
+ ]
+ }
+ ],
+ "simpleParachains": [],
+ "hrmpChannels": [],
+ "finalization": false
+}
.docker/launch-config.jsondiffbeforeafterboth--- a/.docker/launch-config.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "relaychain": {
- "bin": "../polkadot/target/release/polkadot",
- "chain": "westend-local",
- "nodes": [
- {
- "name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
- "port": 30444,
- "flags": [
- "-lparachain::candidate_validation=debug",
- "-lxcm=trace",
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
- "port": 30555,
- "flags": [
- "-lparachain::candidate_validation=debug",
- "-lxcm=trace",
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
- "port": 30666,
- "flags": [
- "-lparachain::candidate_validation=debug",
- "-lxcm=trace",
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
- "port": 30777,
- "flags": [
- "-lparachain::candidate_validation=debug",
- "-lxcm=trace",
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- },
- {
- "name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
- "port": 30888,
- "flags": [
- "-lparachain::candidate_validation=debug",
- "-lxcm=trace",
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external"
- ]
- }
- ],
- "genesis": {
- "runtime": {
- "runtime_genesis_config": {
- "parachainsConfiguration": {
- "config": {
- "validation_upgrade_frequency": 1,
- "validation_upgrade_delay": 1
- }
- }
- }
- }
- }
- },
- "parachains": [
- {
- "bin": "../unique-chain/current/release/unique-collator", #Mainnet TAG
- "upgradeBin": "../unique-chain/target/release/unique-collator", # version in PR develop to master
- "upgradeWasm": "../unique-chain/target/release/wbuild/opal-runtime/opal_runtime.compact.compressed.wasm",
- "id": "1000",
- "balance": "1000000000000000000000000",
- "nodes": [
- {
- "port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
- "name": "alice",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external",
- "-lxcm=trace"
- ]
- },
- {
- "port": 31201,
- "wsPort": 9945,
- "rpcPort": 9934,
- "name": "bob",
- "flags": [
- "--rpc-cors=all",
- "--unsafe-rpc-external",
- "--unsafe-ws-external",
- "-lxcm=trace"
- ]
- }
- ]
- }
- ],
- "simpleParachains": [],
- "hrmpChannels": [],
- "finalization": false
-}
.envdiffbeforeafterboth--- a/.env
+++ b/.env
@@ -1,6 +1,8 @@
RUST_TOOLCHAIN=nightly-2022-05-11
-RUST_C=1.62.0-nightly
-POLKA_VERSION=release-v0.9.24
-UNIQUE_BRANCH=develop
-USER=***
-PASS=***
+POLKADOT_BUILD_BRANCH=release-v0.9.24
+
+POLKADOT_MAINNET_BRANCH=release-v0.9.25
+UNIQUE_MAINNET_TAG=v924010
+
+KUSAMA_MAINNET_BRANCH=release-v0.9.26
+QUARTZ_MAINNET_TAG=v924012
\ No newline at end of file
.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -16,13 +16,7 @@
#Define Workflow variables
env:
- RUST_TOOLCHAIN: nightly-2022-05-11
REPO_URL: ${{ github.server_url }}/${{ github.repository }}
- POLKADOT_BUILD_BRANCH: release-v0.9.24
- POLKADOT_MAINNET_BRANCH: release-v0.9.25 # for unique-runtime
- UNIQUE_MAINNET_TAG: v924010
- KUSAMA_MAINNET_BRANCH: release-v0.9.26 # for для quartz-runtime
- QUARTZ_MAINNET_TAG: v924012
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
@@ -41,11 +35,13 @@
# features: "--features=opal-runtime"
# binary_version:
- network: "Quartz" # KUSAMA_MAINNET_BRANCH для quartz-runtime
- features: "--features=quartz-runtime"
+ features: "quartz-runtime"
+ runtime: "quartz"
mainnet_branch: quartz-v924012-2
mainnet_tag: v924012
- network: "Unique" # POLKADOT_MAINNET_BRANCH для unique-runtime
- features: "--features=unique-runtime"
+ features: "unique-runtime"
+ runtime: "unique"
mainnet_branch: v924010
mainnet_tag: v924010
@@ -70,11 +66,17 @@
# 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:
@@ -93,8 +95,24 @@
- name: Show build configuration
run: cat .docker/docker-compose.${{ matrix.network }}.yml
+ - name: Generate launch-config.json
+ uses: cuchi/jinja2-action@v1.2.0
+ with:
+ template: .docker/launch-config.j2
+ output_file: .docker/launch-config-forkless.json
+ variables: |
+ FEATURE=${{ matrix.features }}
+ RUNTIME=${{ matrix.runtime }}
+
+ - name: Show launch-config-forkless configuration
+ run: cat .docker/launch-config-forkless.json
+
+ - name: Show files in directory
+ run: ls -la
+
+
- name: Build the stack
- run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
+ run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --force-recreate --remove-orphans
# - name: Test Report
@@ -110,6 +128,6 @@
# run: |
# echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"
- - name: Stop running containers
- if: always() # run this step always
- run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
+# - name: Stop running containers
+# if: always() # run this step always
+# run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down