Skip to content

Commit b30515b

Browse files
kozyrevdevkozyrevdev
authored
Merge pull request #736 from UniqueNetwork/release-v930033
Release v930033
2 parents ea2c4b0 + bf21bc0 commit b30515b

96 files changed

Lines changed: 1075 additions & 607 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.docker/Dockerfile-chain-dev‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
FROM ubuntu:20.04
22

3-
ARG RUST_TOOLCHAIN=
4-
ARG FEATURE=
3+
ARG RUST_TOOLCHAIN
4+
ARG NETWORK
55

66
ENV DEBIAN_FRONTEND=noninteractive
77
ENV TZ=Etc/UTC
8-
ENV FEATURE=$FEATURE
8+
ENV NETWORK=$NETWORK
99
ENV CARGO_HOME="/cargo-home"
1010
ENV PATH="/cargo-home/bin:$PATH"
1111

12-
RUN echo "$FEATURE\n" && echo "$RUST_TOOLCHAIN\n"
12+
RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
1313

1414
RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
1515

@@ -26,6 +26,6 @@ COPY . /dev_chain
2626
WORKDIR /dev_chain
2727

2828
RUN cargo build --release
29-
RUN echo "$FEATURE"
29+
RUN echo "$NETWORK"
3030

31-
CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
31+
CMD cargo run --release --features=${NETWORK}-runtime -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external

‎.docker/Dockerfile-chain-dev-unit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ENV PATH="/cargo-home/bin:$PATH"
1010

1111
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1212

13-
ARG RUST_TOOLCHAIN=
14-
ARG FEATURE=
13+
ARG RUST_TOOLCHAIN
14+
ARG NETWORK
1515

1616
RUN rustup toolchain uninstall $(rustup toolchain list) && \
1717
rustup toolchain install $RUST_TOOLCHAIN && \

‎.docker/Dockerfile-parachain‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ FROM ubuntu:20.04 as rust-builder
66
LABEL maintainer="Unique.Network"
77

88
ARG RUST_TOOLCHAIN=
9-
109
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
10+
1111
ENV CARGO_HOME="/cargo-home"
1212
ENV PATH="/cargo-home/bin:$PATH"
1313
ENV TZ=UTC
@@ -35,21 +35,22 @@ WORKDIR /unique_parachain
3535
FROM rust-builder as builder-unique
3636

3737
ARG PROFILE=release
38-
ARG FEATURE=
39-
ARG REPO_URL=
40-
ARG BRANCH=
38+
ARG NETWORK
39+
ARG REPO_URL
40+
ARG BRANCH
41+
42+
RUN echo "NETWORK="${NETWORK}
4143

4244
WORKDIR /unique_parachain
4345

4446
RUN git clone $REPO_URL -b $BRANCH . && \
45-
cargo build --features=$FEATURE --$PROFILE
47+
cargo build --features=${NETWORK}-runtime --$PROFILE
4648

4749
# ===== RUN ======
4850

4951
FROM ubuntu:20.04
5052

51-
ARG POLKADOT_BUILD_BRANCH=
52-
ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
53+
ARG POLKADOT_LAUNCH_BRANCH=
5354

5455
RUN apt-get -y update && \
5556
apt-get -y install curl git && \
@@ -59,7 +60,7 @@ RUN apt-get -y update && \
5960
nvm install v16.16.0 && \
6061
nvm use v16.16.0
6162

62-
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
63+
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
6364

6465
RUN export NVM_DIR="$HOME/.nvm" && \
6566
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -75,5 +76,4 @@ COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkado
7576
CMD export NVM_DIR="$HOME/.nvm" && \
7677
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
7778
cd /polkadot-launch && \
78-
yarn start launch-config.json
79-
79+
yarn start launch-config.json

‎.docker/Dockerfile-parachain-node-only‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,32 @@ WORKDIR /unique_parachain
3535
FROM rust-builder as builder-unique-current
3636

3737
ARG PROFILE=release
38-
ARG FEATURE=
39-
ARG MAINNET_BRANCH=
40-
ARG REPO_URL=
38+
ARG NETWORK
39+
ARG MAINNET_BRANCH
40+
ARG REPO_URL
4141

4242
WORKDIR /unique_parachain
4343

4444
RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
45-
cargo build --features=$FEATURE --$PROFILE
45+
cargo build --features=${NETWORK}-runtime --$PROFILE
4646

4747
# ===== BUILD target version ======
4848
FROM rust-builder as builder-unique-target
4949

5050
ARG PROFILE=release
51-
ARG FEATURE=
51+
ARG NETWORK
5252

5353
COPY . /unique_parachain
5454
WORKDIR /unique_parachain
5555

56-
RUN cargo build --features=$FEATURE --$PROFILE
56+
RUN cargo build --features=${NETWORK}-runtime --$PROFILE
5757

5858
# ===== RUN ======
5959

6060
FROM ubuntu:20.04
6161

62-
ARG RUNTIME=
63-
ENV RUNTIME $RUNTIME
64-
ARG POLKADOT_BUILD_BRANCH=
65-
ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
62+
ARG NETWORK
63+
ARG POLKADOT_LAUNCH_BRANCH
6664

6765
RUN apt-get -y update && \
6866
apt-get -y install curl git && \
@@ -72,20 +70,19 @@ RUN apt-get -y update && \
7270
nvm install v16.16.0 && \
7371
nvm use v16.16.0
7472

75-
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
73+
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
7674

7775
RUN export NVM_DIR="$HOME/.nvm" && \
7876
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
7977
cd /polkadot-launch && \
8078
npm install --global yarn && \
8179
yarn install
8280

83-
RUN echo "$RUNTIME"
84-
RUN echo "$POLKADOT_BUILD_BRANCH"
81+
RUN echo "$NETWORK"
8582

8683
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
8784
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
88-
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
85+
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
8986

9087
COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
9188
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
@@ -94,5 +91,3 @@ CMD export NVM_DIR="$HOME/.nvm" && \
9491
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
9592
cd /polkadot-launch && \
9693
yarn start launch-config.json --test-upgrade-parachains -w -n
97-
98-

‎.docker/Dockerfile-parachain-upgrade‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,31 @@ WORKDIR /unique_parachain
3434
FROM rust-builder as builder-unique-current
3535

3636
ARG PROFILE=release
37-
ARG FEATURE=
38-
ARG MAINNET_BRANCH=
39-
ARG REPO_URL=
37+
ARG NETWORK
38+
ARG MAINNET_BRANCH
39+
ARG REPO_URL
4040

4141
WORKDIR /unique_parachain
4242

4343
RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
44-
cargo build --features=$FEATURE --$PROFILE
44+
cargo build --features=${NETWORK}-runtime --$PROFILE
4545

4646
# ===== BUILD target version ======
4747
FROM rust-builder as builder-unique-target
4848

4949
ARG PROFILE=release
50-
ARG FEATURE=
51-
ARG BRANCH=
52-
ARG REPO_URL=
50+
ARG NETWORK
5351

5452
COPY . /unique_parachain
5553
WORKDIR /unique_parachain
5654

57-
RUN cargo build --features=$FEATURE --$PROFILE
55+
RUN cargo build --features=${NETWORK}-runtime --$PROFILE
5856

5957
# ===== RUN ======
60-
6158
FROM ubuntu:20.04
6259

63-
ARG RUNTIME=
64-
ENV RUNTIME $RUNTIME
65-
ARG POLKADOT_BUILD_BRANCH=
66-
ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
60+
ARG NETWORK
61+
ARG POLKADOT_LAUNCH_BRANCH
6762

6863
RUN apt-get -y update && \
6964
apt-get -y install curl git && \
@@ -73,20 +68,19 @@ RUN apt-get -y update && \
7368
nvm install v16.16.0 && \
7469
nvm use v16.16.0
7570

76-
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
71+
RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
7772

7873
RUN export NVM_DIR="$HOME/.nvm" && \
7974
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
8075
cd /polkadot-launch && \
8176
npm install --global yarn && \
8277
yarn install
8378

84-
RUN echo "$RUNTIME"
85-
RUN echo "$POLKADOT_BUILD_BRANCH"
79+
RUN echo "$NETWORK"
8680

8781
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
8882
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
89-
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
83+
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
9084

9185
COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
9286
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

‎.docker/Dockerfile-parachain-upgrade-data‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,38 +34,35 @@ WORKDIR /unique_parachain
3434
FROM rust-builder as builder-unique-current
3535

3636
ARG PROFILE=release
37-
ARG FEATURE=
38-
ARG MAINNET_BRANCH=
39-
ARG REPO_URL=
37+
ARG NETWORK
38+
ARG MAINNET_BRANCH
39+
ARG REPO_URL
4040

4141
WORKDIR /unique_parachain
4242

4343
RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
44-
cargo build --features=$FEATURE --$PROFILE
44+
cargo build --features=${NETWORK}-runtime --$PROFILE
4545

4646
# ===== BUILD target version ======
4747
FROM rust-builder as builder-unique-target
4848

4949
ARG PROFILE=release
50-
ARG FEATURE=
51-
ARG BRANCH=
52-
ARG REPO_URL=
50+
ARG NETWORK
51+
ARG BRANCH
52+
ARG REPO_URL
5353

5454
COPY . /unique_parachain
5555
WORKDIR /unique_parachain
5656

57-
RUN cargo build --features=$FEATURE --$PROFILE
57+
RUN cargo build --features=${NETWORK}-runtime --$PROFILE
5858

5959
# ===== RUN ======
60-
6160
FROM ubuntu:20.04
6261

63-
ARG RUNTIME=
64-
ENV RUNTIME $RUNTIME
65-
ARG REPLICA_FROM=
66-
ENV REPLICA_FROM=$REPLICA_FROM
67-
ARG POLKADOT_BUILD_BRANCH=
68-
ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
62+
ARG NETWORK
63+
ARG REPLICA_FROM
64+
ENV REPLICA_FROM=${REPLICA_FROM}
65+
ARG POLKADOT_LAUNCH_BRANCH
6966

7067
RUN apt-get -y update && \
7168
apt-get -y install curl git && \
@@ -75,21 +72,20 @@ RUN apt-get -y update && \
7572
nvm install v16.16.0 && \
7673
nvm use v16.16.0
7774

78-
RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b unique-network
75+
RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b ${POLKADOT_LAUNCH_BRANCH}
7976

8077
RUN export NVM_DIR="$HOME/.nvm" && \
8178
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
8279
cd /polkadot-launch && \
8380
npm install --global yarn && \
8481
yarn install
8582

86-
RUN echo "$RUNTIME"
83+
RUN echo "$NETWORK"
8784
RUN echo "$REPLICA_FROM"
88-
RUN echo "$POLKADOT_BUILD_BRANCH"
8985

9086
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
9187
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
92-
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
88+
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
9389

9490
COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
9591

‎.docker/Dockerfile-testnet.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ WORKDIR /unique_parachain
3333

3434
RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
3535
cd unique-chain && \
36-
cargo build --features={{ FEATURE }} --$PROFILE
36+
cargo build --features={{ NETWORK }}-runtime --$PROFILE
3737

3838
# ===== RUN ======
3939

‎.docker/Dockerfile-try-runtime‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM ubuntu:20.04 as rust-builder
33
LABEL maintainer="Unique.Network"
44

5-
ARG RUST_TOOLCHAIN=
5+
ARG RUST_TOOLCHAIN
66

77
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
88
ENV CARGO_HOME="/cargo-home"
@@ -33,17 +33,17 @@ WORKDIR /unique_parachain
3333
FROM rust-builder as builder-unique
3434

3535
ARG PROFILE=release
36-
ARG FEATURE=
37-
ARG REPLICA_FROM=
38-
ENV FEATURE $FEATURE
36+
ARG NETWORK
37+
ARG REPLICA_FROM
38+
ENV NETWORK $NETWORK
3939
ENV REPLICA_FROM $REPLICA_FROM
4040

4141
COPY . /unique_parachain
4242
WORKDIR /unique_parachain
4343

4444

45-
RUN echo "Requested features: $FEATURE\n" && \
45+
RUN echo "Requested features: ${NETWORK}-runtime\n" && \
4646
echo "Fork from: $REPLICA_FROM\n" && \
47-
cargo build --features=$FEATURE --release
47+
cargo build --features=try-runtime,${NETWORK}-runtime --release
4848

49-
CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime -ltry-runtime::cli=debug --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
49+
CMD cargo run --features=try-runtime,${NETWORK}-runtime --release -- try-runtime -ltry-runtime::cli=debug --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM

‎.docker/Dockerfile-xcm.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet
3737

3838
RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
3939
cd unique-chain && \
40-
cargo build --features={{ FEATURE }} --$PROFILE
40+
cargo build --features={{ NETWORK }}-runtime --$PROFILE
4141

4242
# ===== RUN ======
4343

0 commit comments

Comments
 (0)