git.delta.rocks / unique-network / refs/commits / 16828e6c7840

difftreelog

delete unsed vars from CI matrix

Konstantin Astakhov2022-10-28parent: #0dc1cc1.patch.diff
in: master

26 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,15 +1,15 @@
 FROM ubuntu:20.04
 
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
+ARG RUST_TOOLCHAIN
+ARG NETWORK
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
-ENV FEATURE=$FEATURE
+ENV NETWORK=$NETWORK
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 
-RUN echo "$FEATURE\n" && echo "$RUST_TOOLCHAIN\n"
+RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
 
 RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
 
@@ -26,6 +26,6 @@
 WORKDIR /dev_chain
 
 RUN cargo build --release
-RUN echo "$FEATURE"
+RUN echo "$NETWORK"
 
-CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+CMD cargo run --release --features=${NETWORK}-runtime -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
modified.docker/Dockerfile-chain-dev-unitdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev-unit
+++ b/.docker/Dockerfile-chain-dev-unit
@@ -10,8 +10,8 @@
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
+ARG RUST_TOOLCHAIN
+ARG NETWORK
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -35,14 +35,14 @@
 FROM rust-builder as builder-unique
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG REPO_URL=
-ARG BRANCH=
+ARG NETWORK
+ARG REPO_URL
+ARG BRANCH
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
 
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -35,31 +35,30 @@
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG MAINNET_BRANCH
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
 ARG PROFILE=release
-ARG FEATURE=
+ARG NETWORK
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
-ARG RUNTIME
+ARG NETWORK
 ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
@@ -78,11 +77,11 @@
     npm install --global yarn && \
     yarn install
 
-RUN echo "$RUNTIME"
+RUN echo "$NETWORK"
 
 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-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
 
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=910ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN11ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain3233# ===== BUILD current version ======34FROM rust-builder as builder-unique-current3536ARG PROFILE=release37ARG FEATURE=38ARG MAINNET_BRANCH=39ARG REPO_URL=4041WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \44    cargo build --features=$FEATURE --$PROFILE4546# ===== BUILD target version ======47FROM rust-builder as builder-unique-target4849ARG PROFILE=release50ARG FEATURE=51ARG BRANCH=52ARG REPO_URL=5354COPY . /unique_parachain55WORKDIR /unique_parachain5657RUN cargo build --features=$FEATURE --$PROFILE5859# ===== RUN ======6061FROM ubuntu:20.046263ARG RUNTIME64ARG POLKADOT_LAUNCH_BRANCH6566RUN apt-get -y update && \67    apt-get -y install curl git && \68    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \69    export NVM_DIR="$HOME/.nvm" && \70    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \71    nvm install v16.16.0 && \72    nvm use v16.16.07374RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}7576RUN export NVM_DIR="$HOME/.nvm" && \77    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \78    cd /polkadot-launch && \79    npm install --global yarn && \80    yarn install8182RUN echo "$RUNTIME"8384COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/85COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/86COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm8788COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/89COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm9091CMD export NVM_DIR="$HOME/.nvm" && \92    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \93    cd /polkadot-launch && \94    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=910ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN11ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain3233# ===== BUILD current version ======34FROM rust-builder as builder-unique-current3536ARG PROFILE=release37ARG NETWORK38ARG MAINNET_BRANCH39ARG REPO_URL4041WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \44    cargo build --features=${NETWORK}-runtime --$PROFILE4546# ===== BUILD target version ======47FROM rust-builder as builder-unique-target4849ARG PROFILE=release50ARG NETWORK5152COPY . /unique_parachain53WORKDIR /unique_parachain5455RUN cargo build --features=${NETWORK}-runtime --$PROFILE5657# ===== RUN ======58FROM ubuntu:20.045960ARG NETWORK61ARG POLKADOT_LAUNCH_BRANCH6263RUN apt-get -y update && \64    apt-get -y install curl git && \65    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \66    export NVM_DIR="$HOME/.nvm" && \67    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \68    nvm install v16.16.0 && \69    nvm use v16.16.07071RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}7273RUN export NVM_DIR="$HOME/.nvm" && \74    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \75    cd /polkadot-launch && \76    npm install --global yarn && \77    yarn install7879RUN echo "$NETWORK"8081COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/82COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/83COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm8485COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/86COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm8788CMD export NVM_DIR="$HOME/.nvm" && \89    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \90    cd /polkadot-launch && \91    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -34,33 +34,32 @@
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG MAINNET_BRANCH
+ARG REPO_URL
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG BRANCH
+ARG REPO_URL
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
-
 FROM ubuntu:20.04
 
-ARG RUNTIME
+ARG NETWORK
 ARG REPLICA_FROM
 ENV REPLICA_FROM=${REPLICA_FROM}
 ARG POLKADOT_LAUNCH_BRANCH
@@ -81,12 +80,12 @@
     npm install --global yarn && \
     yarn install
 
-RUN echo "$RUNTIME"
+RUN echo "$NETWORK"
 RUN echo "$REPLICA_FROM"
 
 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-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
 
 COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
modified.docker/Dockerfile-testnet.j2diffbeforeafterboth
--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -33,7 +33,7 @@
 
 RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
     cd unique-chain && \
-    cargo build --features={{ FEATURE }} --$PROFILE
+    cargo build --features={{ NETWORK }}-runtime --$PROFILE
 
 # ===== RUN ======
 
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -33,17 +33,17 @@
 FROM rust-builder as builder-unique
 
 ARG PROFILE=release
-ARG FEATURE=
+ARG NETWORK
 ARG REPLICA_FROM=
-ENV FEATURE $FEATURE
+ENV NETWORK $NETWORK
 ENV REPLICA_FROM $REPLICA_FROM
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
 
-RUN echo "Requested features: $FEATURE\n" && \
+RUN echo "Requested features: ${NETWORK}-runtime\n" && \
     echo "Fork from: $REPLICA_FROM\n" && \
-    cargo build --features=$FEATURE --release
+    cargo build --features=${NETWORK}-runtime --release
 
-CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
+CMD cargo run --features=try-runtime,${NETWORK}-runtime --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
modified.docker/docker-compose.tmp-dev.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -5,7 +5,7 @@
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
       context: ../
       dockerfile: .docker/Dockerfile-chain-dev
     expose:
@@ -18,4 +18,4 @@
       options:
         max-size: "1m"
         max-file: "3"
-    command: cargo run --release --features={{ FEATURE }} -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+    command: cargo run --release --features={{ NETWORK }}-runtime -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-data.j2
+++ b/.docker/docker-compose.tmp-forkless-data.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-forkless-nodata.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-nodata.j2
+++ b/.docker/docker-compose.tmp-forkless-nodata.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-master.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-master.j2
+++ b/.docker/docker-compose.tmp-master.j2
@@ -7,5 +7,5 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
modified.docker/docker-compose.tmp-node.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-node.j2
+++ b/.docker/docker-compose.tmp-node.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-unit.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-unit.j2
+++ b/.docker/docker-compose.tmp-unit.j2
@@ -7,7 +7,7 @@
       dockerfile: .docker/Dockerfile-chain-dev-unit
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
     logging:
       options:
         max-size: "1m"
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -5,6 +5,6 @@
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
         - "REPLICA_FROM={{ REPLICA_FROM }}"
 
modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
modified.docker/forkless-config/launch-config-forkless-nodata.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-nodata.j2
+++ b/.docker/forkless-config/launch-config-forkless-nodata.j2
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.docker/forkless-config/launch-config-node-update-only-v3.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-node-update-only-v3.j2
+++ b/.docker/forkless-config/launch-config-node-update-only-v3.j2
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -35,9 +35,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
 
   forkless-update-data:
     needs: execution-marix
@@ -78,8 +78,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
@@ -92,8 +91,7 @@
           template: .docker/forkless-config/launch-config-forkless-data.j2
           output_file: .docker/launch-config-forkless-data.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show launch-config-forkless configuration
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -34,9 +34,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
 
 
   forkless-update-nodata:
@@ -79,8 +79,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
@@ -92,8 +91,7 @@
           template: .docker/forkless-config/launch-config-forkless-nodata.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -35,9 +35,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
  
   parallel-test:
     needs: nodes-execution-matrix
@@ -82,8 +82,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             
       - name: Show build configuration
@@ -95,8 +94,7 @@
           template: .docker/forkless-config/launch-config-node-update-only-v3.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
@@ -232,8 +230,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             
       - name: Show build configuration
@@ -245,8 +242,7 @@
           template: .docker/forkless-config/launch-config-node-update-only-v3.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/market-test.ymldiffbeforeafterboth
--- a/.github/workflows/market-test.yml
+++ b/.github/workflows/market-test.yml
@@ -24,7 +24,6 @@
       matrix:
         include:
           - network: "opal"
-            features: "opal-runtime"
 
     steps:
       - name: Clean Workspace
@@ -61,7 +60,7 @@
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
             POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
 
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -37,9 +37,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
 
 
 
@@ -84,8 +84,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
@@ -97,8 +96,7 @@
           template: .docker/forkless-config/launch-config-forkless-nodata.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/testnet-build.ymldiffbeforeafterboth
--- a/.github/workflows/testnet-build.yml
+++ b/.github/workflows/testnet-build.yml
@@ -40,9 +40,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}
-            network {unique}, runtime {unique}, features {unique-runtime}
+            network {opal}
+            network {quartz}
+            network {unique}
 
   testnet-build:
     needs: prepare-execution-marix
@@ -85,8 +85,7 @@
             NETWORK=${{ matrix.network }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
             POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -19,13 +19,10 @@
       matrix:
         include:
           - network: opal
-            features: opal-runtime
             replica_from_address: wss://eu-ws-opal.unique.network:443
           - network: quartz
-            features: quartz-runtime
             replica_from_address: wss://eu-ws-quartz.unique.network:443
           - network: unique
-            features: unique-runtime
             replica_from_address: wss://eu-ws.unique.network:443
 
     steps:
@@ -48,7 +45,7 @@
           output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
modified.github/workflows/yarn-dev.ymldiffbeforeafterboth
--- a/.github/workflows/yarn-dev.yml
+++ b/.github/workflows/yarn-dev.yml
@@ -24,11 +24,8 @@
       matrix:
         include:
           - network: "opal"
-            features: "opal-runtime"
           - network: "quartz"
-            features: "quartz-runtime"
           - network: "unique"
-            features: "unique-runtime"
 
     steps:
 
@@ -50,7 +47,7 @@
           output_file: .docker/docker-compose.${{ matrix.network }}.yml
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
     
 
       - name: Show build configuration