git.delta.rocks / unique-network / refs/commits / 882ea0a14b61

difftreelog

Merge branch 'feature/multi-assets-redone' of https://github.com/UniqueNetwork/unique-chain into feature/multi-assets-redone

Dev2022-09-12parents: #a6179b8 #012988d.patch.diff
in: master

16 files changed

added.docker/Dockerfile-acala.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-acala.j2
@@ -0,0 +1,41 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+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 llvm libudev-dev && \
+    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 ACALA =====
+FROM rust-builder as builder-acala-bin
+
+WORKDIR /unique_parachain
+
+RUN git clone -b {{ ACALA_BUILD_BRANCH }} --depth 1 https://github.com/AcalaNetwork/Acala.git && \
+    cd Acala && \
+    make init && \
+    make build-release
+
+# ===== BIN ======
+
+FROM ubuntu:20.04 as builder-acala
+
+COPY --from=builder-acala-bin /unique_parachain/Acala/target/production/acala /unique_parachain/Acala/target/production/acala
added.docker/Dockerfile-cumulus.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-cumulus.j2
@@ -0,0 +1,40 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+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 llvm libudev-dev && \
+    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 CUMULUS =====
+FROM rust-builder as builder-cumulus-bin
+
+WORKDIR /unique_parachain
+
+RUN git clone -b {{ CUMULUS_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/cumulus.git && \
+    cd cumulus && \
+    cargo build --release
+
+# ===== BIN ======
+
+FROM ubuntu:20.04 as builder-cumulus
+
+COPY --from=builder-cumulus-bin /unique_parachain/cumulus/target/release/polkadot-parachain /unique_parachain/cumulus/target/release/polkadot-parachain
added.docker/Dockerfile-moonbeam.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-moonbeam.j2
@@ -0,0 +1,41 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+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 llvm libudev-dev && \
+    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 MOONBEAM =====
+FROM rust-builder as builder-moonbeam-bin
+
+WORKDIR /unique_parachain
+
+RUN git clone -b {{ MOONBEAM_BUILD_BRANCH }} --depth 1 https://github.com/PureStake/moonbeam.git && \
+    cd moonbeam && \
+    cargo build --release
+
+# ===== BIN ======
+
+FROM ubuntu:20.04 as builder-moonbeam
+
+COPY --from=builder-moonbeam-bin /unique_parachain/moonbeam/target/release/moonbeam /unique_parachain/moonbeam/target/release/moonbeam
\ No newline at end of file
added.docker/Dockerfile-polkadot.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/Dockerfile-polkadot.j2
@@ -0,0 +1,40 @@
+# ===== Rust builder =====
+FROM ubuntu:20.04 as rust-builder
+LABEL maintainer="Unique.Network"
+
+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 llvm libudev-dev && \
+    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 POLKADOT =====
+FROM rust-builder as builder-polkadot-bin
+
+WORKDIR /unique_parachain
+
+RUN git clone -b {{ POLKADOT_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/polkadot.git && \
+    cd polkadot && \
+    cargo build --release
+
+# ===== BIN ======
+
+FROM ubuntu:20.04 as builder-polkadot
+
+COPY --from=builder-polkadot-bin /unique_parachain/polkadot/target/release/polkadot /unique_parachain/polkadot/target/release/polkadot
deleted.docker/Dockerfile-testnetdiffbeforeafterboth
--- a/.docker/Dockerfile-testnet
+++ /dev/null
@@ -1,96 +0,0 @@
-# ===== 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 llvm libudev-dev && \
-    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 BRANCH=
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $BRANCH https://github.com/UniqueNetwork/unique-chain.git && \
-    cd unique-chain && \
-    cargo build --features=$FEATURE --$PROFILE
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-
-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 POLKADOT_LAUNCH_BRANCH=
-ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH
-
-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
-
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b $POLKADOT_LAUNCH_BRANCH
-
-RUN export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    npm install --global yarn && \
-    yarn install
-
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
-
-CMD export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json
-
-
deleted.docker/Dockerfile-testnet.j2diffbeforeafterboth
--- a/.docker/Dockerfile-testnet.j2
+++ /dev/null
@@ -1,96 +0,0 @@
-# ===== 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 llvm libudev-dev && \
-    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 BRANCH=
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
-    cd unique-chain && \
-    cargo build --features={{ FEATURE }} --$PROFILE
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-#ARG POLKADOT_BUILD_BRANCH=
-#ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-
-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 POLKADOT_LAUNCH_BRANCH=
-#ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH
-
-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
-
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}
-
-RUN export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    npm install --global yarn && \
-    yarn install
-
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
-
-CMD export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json
-
-
deleted.docker/Dockerfile-xcmdiffbeforeafterboth
--- a/.docker/Dockerfile-xcm
+++ /dev/null
@@ -1,146 +0,0 @@
-# ===== 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 llvm libudev-dev && \
-    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 BRANCH=
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $BRANCH https://github.com/UniqueNetwork/unique-chain.git && \
-    cd unique-chain && \
-    cargo build --features=$FEATURE --$PROFILE
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    cargo build --release
-
-# ===== BUILD ACALA =====
-FROM rust-builder as builder-acala
-
-ARG ACALA_BUILD_BRANCH=
-ENV ACALA_BUILD_BRANCH $ACALA_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $ACALA_BUILD_BRANCH --depth 1 https://github.com/AcalaNetwork/Acala.git && \
-    cd Acala && \
-    make init && \
-    make build-release
-
-# ===== BUILD MOONBEAM =====
-FROM rust-builder as builder-moonbeam
-
-ARG MOONBEAM_BUILD_BRANCH=
-ENV MOONBEAM_BUILD_BRANCH $MOONBEAM_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $MOONBEAM_BUILD_BRANCH --depth 1 https://github.com/PureStake/moonbeam.git && \
-    cd moonbeam && \
-    cargo build --release
-
-# ===== BUILD CUMULUS =====
-FROM rust-builder as builder-cumulus
-
-ARG CUMULUS_BUILD_BRANCH=
-ENV CUMULUS_BUILD_BRANCH $CUMULUS_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $CUMULUS_BUILD_BRANCH --depth 1 https://github.com/paritytech/cumulus.git && \
-    cd cumulus && \
-    cargo build --release
-
-# ===== BUILD CHAINQL =====
-FROM rust-builder as builder-chainql
-
-RUN mkdir chainql
-WORKDIR /chainql
-
-RUN git clone -b v0.1.0 --depth 1 https://github.com/CertainLach/chainql.git . && \
-    cargo build --release
-
-# ===== RUN ======
-
-FROM ubuntu:20.04
-
-ARG POLKADOT_LAUNCH_BRANCH=
-ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH
-
-RUN apt-get -y update && \
-      apt-get -y install curl git jsonnet && \
-      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
-
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b $POLKADOT_LAUNCH_BRANCH
-
-RUN export NVM_DIR="$HOME/.nvm" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    npm install --global yarn && \
-    yarn install
-
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
-COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
-COPY --from=builder-acala /unique_parachain/Acala/target/production/acala /acala/target/release/
-COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9946
-EXPOSE 9947
-EXPOSE 9948
-
-CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
-    cd /polkadot-launch && \
-    yarn start launch-config.json
deleted.docker/docker-compose-testnet.ymldiffbeforeafterboth
--- a/.docker/docker-compose-testnet.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-testnet
-    expose:
-      - 9844
-      - 9944
-    ports:
-      - 127.0.0.1:9844:9844
-      - 127.0.0.1:9944:9944
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
deleted.docker/docker-compose-xcm.ymldiffbeforeafterboth
--- a/.docker/docker-compose-xcm.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-xcm
-    expose:
-      - 9844
-      - 9944
-      - 9946
-      - 9947
-      - 9948
-    ports:
-      - 127.0.0.1:9844:9844
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9946:9946
-      - 127.0.0.1:9947:9947
-      - 127.0.0.1:9948:9948
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
deleted.docker/docker-compose.tmp-testnet.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-testnet.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      args:
-        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "BRANCH={{ BRANCH }}"
-        - "FEATURE={{ FEATURE }}"
-        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
-        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
-    image: testnet_node_{{ NETWORK }}
-    container_name: testnet_node_{{ NETWORK }}
-    volumes:
-       - type: bind
-         source: ./testnet-config/launch-config-testnet.json
-         target: /polkadot-launch/launch-config.json
-         read_only: true
deleted.docker/docker-compose.tmp-xcm-quartz.ymldiffbeforeafterboth
--- a/.docker/docker-compose.tmp-xcm-quartz.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      args:
-        - "RUST_TOOLCHAIN=nightly-2022-07-24"
-        - "BRANCH=release-v927020"
-        - "FEATURE=quartz-runtime"
-        - "POLKADOT_BUILD_BRANCH=release-v0.9.27"
-        - "ACALA_BUILD_BRANCH=2.9.0"
-        - "MOONBEAM_BUILD_BRANCH=v0.25.0"
-        - "CUMULUS_BUILD_BRANCH=release-v0.9.230"
-        - "POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec"
-    image: xcm_nodes_quartz
-    container_name: xcm_nodes_quartz
-    volumes:
-       - type: bind
-         source: ./xcm-config/launch-config-xcm-quartz.json
-         target: /polkadot-launch/launch-config.json
-         read_only: true
-       - type: bind
-         source: ./xcm-config/5validators.jsonnet
-         target: /polkadot-launch/5validators.jsonnet
-         read_only: true
deleted.docker/docker-compose.tmp-xcm-unique.ymldiffbeforeafterboth
--- a/.docker/docker-compose.tmp-xcm-unique.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      args:
-        - "RUST_TOOLCHAIN=nightly-2022-07-24"
-        - "BRANCH=release-v927020"
-        - "REPO_URL=https://github.com/UniqueNetwork/unique-chain.git"
-        - "FEATURE=unique-runtime"
-        - "POLKADOT_BUILD_BRANCH=release-v0.9.27"
-        - "ACALA_BUILD_BRANCH=2.9.0"
-        - "MOONBEAM_BUILD_BRANCH=v0.25.0"
-        - "CUMULUS_BUILD_BRANCH=release-v0.9.230"
-        - "POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec"          
-    image: xcm_nodes_unique
-    container_name: xcm_nodes_unique         
-    volumes:
-       - type: bind
-         source: ./xcm-config/launch-config-xcm-unique.json
-         target: /polkadot-launch/launch-config.json
-         read_only: true
-       - type: bind
-         source: ./xcm-config/5validators.jsonnet
-         target: /polkadot-launch/5validators.jsonnet
-         read_only: true
-
deleted.docker/docker-compose.tmp-xcm.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-xcm.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "3.5"
-
-services:
-  xcm_nodes:
-    build:
-      args:
-        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "BRANCH={{ BRANCH }}"
-        - "FEATURE={{ FEATURE }}"
-        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
-        - "ACALA_BUILD_BRANCH={{ ACALA_BUILD_BRANCH }}"
-        - "MOONBEAM_BUILD_BRANCH={{ MOONBEAM_BUILD_BRANCH }}"
-        - "CUMULUS_BUILD_BRANCH={{ CUMULUS_BUILD_BRANCH }}"
-        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
-    image: xcm_nodes_{{ NETWORK }}
-    container_name: xcm_nodes_{{ NETWORK }}
-    volumes:
-       - type: bind
-         source: ./xcm-config/launch-config-xcm-{{ NETWORK }}.json
-         target: /polkadot-launch/launch-config.json
-         read_only: true
deleted.docker/testnet-config/launch-config-testnet.jsondiffbeforeafterboth
--- a/.docker/testnet-config/launch-config-testnet.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "relaychain": {
-        "bin": "../polkadot/target/release/polkadot",
-        "chain": "rococo-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/target/release/unique-collator",
-            "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
-}
modified.github/workflows/xcm-testnet-build.ymldiffbeforeafterboth
76      - name: Read .env file76      - name: Read .env file
77        uses: xom9ikk/dotenv@v1.0.277        uses: xom9ikk/dotenv@v1.0.2
7878
79      - name: Log in to Docker Hub
80        uses: docker/login-action@v2.0.0
81        with:
82          username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}
83          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
84
85      - name: Install jq
86        run: sudo apt install jq -y
87
88      # Check POLKADOT version and build it if it doesn't exist in repository
89      - name: Generate ENV related extend Dockerfile file for POLKADOT
90        uses: cuchi/jinja2-action@v1.2.0
91        with:
92          template: .docker/Dockerfile-polkadot.j2
93          output_file: .docker/Dockerfile-polkadot.${{ env.POLKADOT_BUILD_BRANCH }}.yml
94          variables: |
95            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
96            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
97
98      - name: Check if the dockerhub repository contains the needed version POLKADOT
99        run: |
100          # aquire token
101            TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
102            export TOKEN=$TOKEN
103
104          # Get TAGS from DOCKERHUB POLKADOT repository
105            POLKADOT_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-polkadot/tags/?page_size=100 | jq -r '."results"[]["name"]')
106          # Show TAGS
107            echo "POLKADOT TAGS:"
108            echo $POLKADOT_TAGS
109          # Check correct version POLKADOT and build it if it doesn't exist in POLKADOT TAGS
110            if [[ ${POLKADOT_TAGS[*]} =~ (^|[[:space:]])"${{ env.POLKADOT_BUILD_BRANCH }}"($|[[:space:]]) ]]; then
111                echo "Repository has needed POLKADOT version";
112                docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}
113            else
114                echo "Repository has not needed POLKADOT version, so build it";
115                cd .docker/ && docker build --no-cache --file ./Dockerfile-polkadot.${{ env.POLKADOT_BUILD_BRANCH }}.yml --tag uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }} .
116                echo "Push needed POLKADOT version to the repository";
117                docker push uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}
118            fi
119        shell: bash
120
121      # Check ACALA version and build it if it doesn't exist in repository
122      - name: Generate ENV related extend Dockerfile file for ACALA
123        uses: cuchi/jinja2-action@v1.2.0
124        with:
125          template: .docker/Dockerfile-acala.j2
126          output_file: .docker/Dockerfile-acala.${{ matrix.acala_version }}.yml
127          variables: |
128            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
129            ACALA_BUILD_BRANCH=${{ matrix.acala_version }}
130
131      - name: Check if the dockerhub repository contains the needed ACALA version
132        run: |
133          # aquire token
134            TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
135            export TOKEN=$TOKEN
136
137          # Get TAGS from DOCKERHUB repository
138            ACALA_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-acala/tags/?page_size=100 | jq -r '."results"[]["name"]')
139          # Show TAGS
140            echo "ACALA TAGS:"
141            echo $ACALA_TAGS
142          # Check correct version ACALA and build it if it doesn't exist in ACALA TAGS
143            if [[ ${ACALA_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.acala_version }}"($|[[:space:]]) ]]; then
144                echo "Repository has needed ACALA version";
145                docker pull uniquenetwork/builder-acala:${{ matrix.acala_version }}
146            else
147                echo "Repository has not needed ACALA version, so build it";
148                cd .docker/ && docker build --no-cache --file ./Dockerfile-acala.${{ matrix.acala_version }}.yml --tag uniquenetwork/builder-acala:${{ matrix.acala_version }} .
149                echo "Push needed ACALA version to the repository";
150                docker push uniquenetwork/builder-acala:${{ matrix.acala_version }}
151            fi
152        shell: bash
153
154      # Check MOONBEAM version and build it if it doesn't exist in repository
155      - name: Generate ENV related extend Dockerfile file for MOONBEAM
156        uses: cuchi/jinja2-action@v1.2.0
157        with:
158          template: .docker/Dockerfile-moonbeam.j2
159          output_file: .docker/Dockerfile-moonbeam.${{ matrix.moonbeam_version }}.yml
160          variables: |
161            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
162            MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}
163
164      - name: Check if the dockerhub repository contains the needed MOONBEAM version
165        run: |
166          # aquire token
167            TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
168            export TOKEN=$TOKEN
169
170          # Get TAGS from DOCKERHUB repository
171            MOONBEAM_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-moonbeam/tags/?page_size=100 | jq -r '."results"[]["name"]')
172          # Show TAGS
173            echo "MOONBEAM TAGS:"
174            echo $MOONBEAM_TAGS
175          # Check correct version MOONBEAM and build it if it doesn't exist in MOONBEAM TAGS
176            if [[ ${MOONBEAM_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.moonbeam_version }}"($|[[:space:]]) ]]; then
177                echo "Repository has needed MOONBEAM version";
178                docker pull uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}
179            else
180                echo "Repository has not needed MOONBEAM version, so build it";
181                cd .docker/ && docker build --no-cache --file ./Dockerfile-moonbeam.${{ matrix.moonbeam_version }}.yml --tag uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }} .
182                echo "Push needed MOONBEAM version to the repository";
183                docker push uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}
184            fi
185        shell: bash
186
187
188      # Check CUMULUS version and build it if it doesn't exist in repository
189      - name: Generate ENV related extend Dockerfile file for CUMULUS
190        uses: cuchi/jinja2-action@v1.2.0
191        with:
192          template: .docker/Dockerfile-cumulus.j2
193          output_file: .docker/Dockerfile-cumulus.${{ matrix.cumulus_version }}.yml
194          variables: |
195            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
196            CUMULUS_BUILD_BRANCH=${{ matrix.cumulus_version }}
197
198      - name: Check if the dockerhub repository contains the needed CUMULUS version
199        run: |                 
200          # aquire token
201            TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
202            export TOKEN=$TOKEN
203
204          # Get TAGS from DOCKERHUB repository
205            CUMULUS_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-cumulus/tags/?page_size=100 | jq -r '."results"[]["name"]')
206          # Show TAGS
207            echo "CUMULUS TAGS:"
208            echo $CUMULUS_TAGS
209          # Check correct version CUMULUS and build it if it doesn't exist in CUMULUS TAGS
210            if [[ ${CUMULUS_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.cumulus_version }}"($|[[:space:]]) ]]; then
211                echo "Repository has needed CUMULUS version";
212                docker pull uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}
213            else
214                echo "Repository has not needed CUMULUS version, so build it";
215                cd .docker/ && docker build --no-cache --file ./Dockerfile-cumulus.${{ matrix.cumulus_version }}.yml --tag uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }} .
216                echo "Push needed CUMULUS version to the repository";
217                docker push uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}
218            fi
219        shell: bash
220
221
222      # Build main image for XCM   
79      - name: Generate ENV related extend Dockerfile file223      - name: Generate ENV related extend Dockerfile file
80        uses: cuchi/jinja2-action@v1.2.0224        uses: cuchi/jinja2-action@v1.2.0
81        with:225        with:
107          find: '/'251          find: '/'
108          replace: '-'252          replace: '-'
109
110      - name: Log in to Docker Hub
111        uses: docker/login-action@v2.0.0
112        with:
113          username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}
114          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
115
116      - name: Pull acala docker image
117        run: docker pull uniquenetwork/builder-acala:${{ matrix.acala_version }}
118
119      - name: Pull moonbeam docker image
120        run: docker pull uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}
121
122      - name: Pull cumulus docker image
123        run: docker pull uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}
124
125      - name: Pull polkadot docker image
126        run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}
127253
128      - name: Pull chainql docker image254      - name: Pull chainql docker image
129        run: docker pull uniquenetwork/builder-chainql:latest255        run: docker pull uniquenetwork/builder-chainql:latest
modified.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth
--- a/.github/workflows/xcm-tests_v2.yml
+++ b/.github/workflows/xcm-tests_v2.yml
@@ -17,7 +17,7 @@
 
     name: Prepare execution matrix
 
-#    needs: [xcm-testnet-build]
+    #needs: [xcm-testnet-build]
 
     runs-on: XL
     outputs:
@@ -59,7 +59,6 @@
     strategy:
       matrix:
         include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
-
 
     steps:
       - name: Skip if pull request is in Draft