git.delta.rocks / unique-network / refs/commits / 53cde763820f

difftreelog

Fix XCM local config

Max Andreev2023-03-30parent: #951a40f.patch.diff
in: master

6 files changed

modified.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.tempdiffbeforeafterboth
before · .docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
1FROM uniquenetwork/builder-polkadot:{{ KUSAMA_MAINNET_BRANCH }} as polkadot2FROM uniquenetwork/builder-moonbeam:{{ MOONRIVER_BUILD_BRANCH }} as moonbeam3FROM uniquenetwork/builder-cumulus:{{ STATEMINE_BUILD_BRANCH }} as cumulus4FROM uniquenetwork/builder-acala:{{ KARURA_BUILD_BRANCH }} as acala56# ===== Rust builder =====7FROM ubuntu:22.04 as rust-builder8LABEL maintainer="Unique.Network"910ENV CARGO_HOME="/cargo-home"11ENV PATH="/cargo-home/bin:$PATH"12ENV TZ=UTC13RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1415RUN apt-get update && \16    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \17    apt-get clean && \18    rm -r /var/lib/apt/lists/*1920RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2122RUN rustup toolchain uninstall $(rustup toolchain list) && \23    rustup toolchain install {{ RUST_TOOLCHAIN }} && \24    rustup default {{ RUST_TOOLCHAIN }} && \25    rustup target list --installed && \26    rustup show27RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2829RUN mkdir /unique_parachain30WORKDIR /unique_parachain3132# ===== BUILD ======33FROM rust-builder as builder-unique3435ARG BRANCH36ARG PROFILE=release3738WORKDIR /unique_parachain39#COPY . .4041RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git . && \42#    cd unique-chain && \43  cargo build --features=quartz-runtime --$PROFILE4445# ===== RUN ======46FROM ubuntu:22.044748RUN apt-get -y update && \49      apt-get -y install curl git && \50      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \51      export NVM_DIR="$HOME/.nvm" && \52      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \53      nvm install v16.16.0 && \54      nvm use v16.16.05556RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}5758RUN export NVM_DIR="$HOME/.nvm" && \59    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \60    cd /polkadot-launch && \61    npm install --global yarn && \62    yarn install6364COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/launch-config.json65COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet6667COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/68COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/69COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/70COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus71COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/72COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7374EXPOSE 984475EXPOSE 994476EXPOSE 994677EXPOSE 994778EXPOSE 99487980CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \81    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \82    cd /polkadot-launch && \83    yarn start launch-config.json
after · .docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
1FROM uniquenetwork/builder-polkadot:{{ KUSAMA_MAINNET_BRANCH }} as polkadot2FROM uniquenetwork/builder-moonbeam:{{ MOONRIVER_BUILD_BRANCH }} as moonbeam3FROM uniquenetwork/builder-cumulus:{{ STATEMINE_BUILD_BRANCH }} as cumulus4FROM uniquenetwork/builder-acala:{{ KARURA_BUILD_BRANCH }} as acala5FROM uniquenetwork/builder-astar:{{ SHIDEN_BUILD_BRANCH }} as astar67# ===== Rust builder =====8FROM ubuntu:22.04 as rust-builder9LABEL maintainer="Unique.Network"1011ENV 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 llvm libudev-dev 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_TOOLCHAIN }}2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain3233# ===== BUILD ======34FROM rust-builder as builder-unique3536ARG BRANCH37ARG PROFILE=release3839WORKDIR /unique_parachain40#COPY . .4142RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git . && \43#    cd unique-chain && \44  cargo build --features=quartz-runtime --$PROFILE4546# ===== RUN ======47FROM ubuntu:22.044849RUN apt-get -y update && \50      apt-get -y install curl git && \51      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \52      export NVM_DIR="$HOME/.nvm" && \53      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \54      nvm install v16.16.0 && \55      nvm use v16.16.05657RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}5859RUN export NVM_DIR="$HOME/.nvm" && \60    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \61    cd /polkadot-launch && \62    npm install --global yarn && \63    yarn install6465COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/launch-config.json66COPY --from=builder-unique /unique_parachain/.docker/xcm-config/6validators.jsonnet /polkadot-launch/6validators.jsonnet6768COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/69COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/70COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/71COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus72COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/73COPY --from=astar /unique_parachain/Astar/target/production/astar /astar/target/release/74COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7576EXPOSE 984477EXPOSE 994478EXPOSE 994679EXPOSE 994780EXPOSE 994881EXPOSE 99498283CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \84    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \85    cd /polkadot-launch && \86    yarn start launch-config.json
modified.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
@@ -2,6 +2,7 @@
 FROM uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} as moonbeam
 FROM uniquenetwork/builder-cumulus:{{ STATEMINT_BUILD_BRANCH }} as cumulus
 FROM uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} as acala
+FROM uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} as astar
 
 # ===== Rust builder =====
 FROM ubuntu:22.04 as rust-builder
@@ -62,13 +63,14 @@
     yarn install
 
 COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json /polkadot-launch/launch-config.json
-COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet
+COPY --from=builder-unique /unique_parachain/.docker/xcm-config/6validators.jsonnet /polkadot-launch/6validators.jsonnet
 
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
 COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
 COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/
+COPY --from=astar /unique_parachain/Astar/target/production/astar /astar/target/release/
 COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
 EXPOSE 9844
@@ -76,6 +78,7 @@
 EXPOSE 9946
 EXPOSE 9947
 EXPOSE 9948
+EXPOSE 9949
 
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/additional/xcm-rococo/docker-compose-xcm-quartz-rococo.ymldiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/docker-compose-xcm-quartz-rococo.yml
+++ b/.docker/additional/xcm-rococo/docker-compose-xcm-quartz-rococo.yml
@@ -13,10 +13,12 @@
       - 9946
       - 9947
       - 9948
+      - 9949
     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
+      - 127.0.0.1:9949:9949
modified.docker/additional/xcm-rococo/docker-compose-xcm-unique-rococo.ymldiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/docker-compose-xcm-unique-rococo.yml
+++ b/.docker/additional/xcm-rococo/docker-compose-xcm-unique-rococo.yml
@@ -13,10 +13,12 @@
       - 9946
       - 9947
       - 9948
+      - 9949
     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
+      - 127.0.0.1:9949:9949
modified.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.jsondiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
@@ -5,7 +5,7 @@
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
-                "5validators.jsonnet"
+                "6validators.jsonnet"
             ],	
         "nodes": [
             {
@@ -62,8 +62,18 @@
                     "--unsafe-ws-external",
                     "-lparachain::candidate_validation=debug"
                 ]
+            },
+            {
+                "name": "ferdie",
+                "wsPort": 9899,
+                "rpcPort": 9898,
+                "port": 30999,
+                "flags": [
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external",
+                    "-lparachain::candidate_validation=debug"
+                ]
             }
-
         ],
         "genesis": {
             "runtime": {
@@ -155,6 +165,23 @@
                     ]
                 }
             ]
+        },
+        {
+            "bin": "/astar/target/release/astar",
+            "id": "2007",
+            "chain": "shiden-dev",
+            "balance": "1000000000000000000000000",
+            "nodes": [
+                {
+                    "wsPort": 9949,
+                    "port": 31205,
+                    "name": "alice",
+                    "flags": [
+                       "--unsafe-rpc-external",
+                       "--unsafe-ws-external"
+                    ]
+                }
+            ]
         }
     ],
     "simpleParachains": [],
@@ -194,7 +221,19 @@
             "recipient": 2095,
             "maxCapacity": 8,
             "maxMessageSize": 512
-        }
+        },
+        {
+            "sender": 2007,
+            "recipient": 2095,
+            "maxCapacity": 8,
+            "maxMessageSize": 512
+        },
+        {
+            "sender": 2095,
+            "recipient": 2007,
+            "maxCapacity": 8,
+            "maxMessageSize": 512
+        }  
     ],
     "finalization": false
 }
modified.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.jsondiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
@@ -5,7 +5,7 @@
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
-                "5validators.jsonnet"
+                "6validators.jsonnet"
             ],	
         "nodes": [
             {
@@ -62,8 +62,18 @@
                     "--unsafe-ws-external",
                     "-lparachain::candidate_validation=debug"
                 ]
+            },
+            {
+                "name": "ferdie",
+                "wsPort": 9899,
+                "rpcPort": 9898,
+                "port": 30999,
+                "flags": [
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external",
+                    "-lparachain::candidate_validation=debug"
+                ]
             }
-
         ],
         "genesis": {
             "runtime": {
@@ -155,6 +165,23 @@
 		    ]
                 }
             ]
+        },
+        {
+            "bin": "/astar/target/release/astar",
+            "id": "2006",
+            "chain": "astar-dev",
+            "balance": "1000000000000000000000000",
+            "nodes": [
+                {
+                    "wsPort": 9949,
+                    "port": 31205,
+                    "name": "alice",
+                    "flags": [
+                       "--unsafe-rpc-external",
+                       "--unsafe-ws-external"
+                    ]
+                }
+            ]
         }
     ],
     "simpleParachains": [],
@@ -194,7 +221,19 @@
             "recipient": 2037,
             "maxCapacity": 8,
             "maxMessageSize": 512
-        }
+        },
+        {
+            "sender": 2006,
+            "recipient": 2037,
+            "maxCapacity": 8,
+            "maxMessageSize": 512
+        },
+        {
+            "sender": 2037,
+            "recipient": 2006,
+            "maxCapacity": 8,
+            "maxMessageSize": 512
+        }     
     ],
     "finalization": false
 }