From 405963f1d11ce11ffdf179cc7b1b2aa333ea31b7 Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Tue, 09 Aug 2022 21:36:29 +0000 Subject: [PATCH] Fixing state by the end if day. --- --- a/.docker/Dockerfile-parachain-upgrade +++ b/.docker/Dockerfile-parachain-upgrade @@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y cmake curl pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -40,9 +40,8 @@ RUN mkdir /unique_parachain WORKDIR /unique_parachain -RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL" RUN git clone $REPO_URL -b $MAINNET_BRANCH . -RUN cargo build $FEATURE --$PROFILE +RUN cargo build --features=$FEATURE --$PROFILE # ===== BUILD target version ====== @@ -57,10 +56,8 @@ WORKDIR /unique_parachain RUN git clone $REPO_URL -b $BRANCH . -RUN cargo build $FEATURE --$PROFILE +RUN cargo build --features=$FEATURE --$PROFILE -COPY /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json - # ===== BUILD POLKADOT ===== FROM rust-builder as builder-polkadot @@ -98,11 +95,8 @@ COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/ COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/ COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ - -COPY --from=builder-unique-target /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json - CMD export NVM_DIR="$HOME/.nvm" && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ - yarn start launch-config.json --test-upgrade + yarn start launch-config.json --- 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 --- /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 +} --- 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 -} --- 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 --- 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 -- gitstuff