git.delta.rocks / unique-network / refs/commits / 44f2ea103b86

difftreelog

xcm-local-stand

Konstantin Astakhov2023-01-19parent: #f897c8b.patch.diff
in: master

3 files changed

modified.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococodiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo
@@ -1,6 +1,3 @@
-ARG CHAIN=quartz
-ARG LAUNCH_CONFIG_FILE=launch-config-xcm-quartz-rococo.json
-
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -20,11 +17,11 @@
 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 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 rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
@@ -33,7 +30,6 @@
 FROM rust-builder as builder-unique
 
 ARG BRANCH
-ARG CHAIN
 ARG PROFILE=release
 
 WORKDIR /unique_parachain
@@ -41,7 +37,7 @@
 
 RUN git clone -b ${BRANCH} https://github.com/UniqueNetwork/unique-chain.git . && \
 #    cd unique-chain && \
-  cargo build --features=${CHAIN}-runtime --$PROFILE
+  cargo build --features=quartz-runtime --$PROFILE
 
 # ===== RUN ======
 FROM ubuntu:20.04
@@ -63,7 +59,7 @@
       nvm install v16.16.0 && \
       nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}
+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" && \
@@ -71,7 +67,7 @@
     npm install --global yarn && \
     yarn install
 
-COPY --from=builder-unique /unique_parachain/.docker/xcm-config/${LAUNCH_CONFIG_FILE} /polkadot-launch/
+COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/
 COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet
 COPY --from=builder-unique /unique_parachain/.docker/xcm-config/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
 
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
@@ -4,7 +4,13 @@
   xcm_quartz_rococo:
     build:
       args:
-        - "BRANCH=develop"
+        - "BRANCH=feature/xcm-local-stand"
+        - "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}"
+        - "POLKADOT_LAUNCH_BRANCH=${POLKADOT_LAUNCH_BRANCH}"
+        - "POLKADOT_BUILD_BRANCH=${POLKADOT_BUILD_BRANCH}"
+        - "MOONRIVER_BUILD_BRANCH=${MOONRIVER_BUILD_BRANCH}"
+        - "STATEMINE_BUILD_BRANCH=${STATEMINE_BUILD_BRANCH}"
+        - "KARURA_BUILD_BRANCH=${KARURA_BUILD_BRANCH}"        
       context: .
       dockerfile: .Dockerfile-xcm-quartz-rococo
     container_name: xcm-quartz-rococo
@@ -22,7 +28,4 @@
       - 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"
+
added.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.jsondiffbeforeafterboth
after · .docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
1{2    "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "chain": "rococo-local",5        "chainInitializer": [6                "chainql",7                "--tla-code=spec=import '${spec}'",8                "5validators.jsonnet"9            ],	10        "nodes": [11            {12                "name": "alice",13                "wsPort": 9844,14                "rpcPort": 9843,15                "port": 30444,16                "flags": [17                    "--unsafe-rpc-external",18                    "--unsafe-ws-external",19                    "-lparachain::candidate_validation=debug"20                ]21            },22            {23                "name": "bob",24                "wsPort": 9855,25                "rpcPort": 9854,26                "port": 30555,27                "flags": [28                    "--unsafe-rpc-external",29                    "--unsafe-ws-external",30                    "-lparachain::candidate_validation=debug"31                ]32            },33            {34                "name": "charlie",35                "wsPort": 9866,36                "rpcPort": 9865,37                "port": 30666,38                "flags": [39                    "--unsafe-rpc-external",40                    "--unsafe-ws-external",41                    "-lparachain::candidate_validation=debug"42                ]43            },44            {45                "name": "dave",46                "wsPort": 9877,47                "rpcPort": 9876,48                "port": 30777,49                "flags": [50                    "--unsafe-rpc-external",51                    "--unsafe-ws-external",52                    "-lparachain::candidate_validation=debug"53                ]54            },55            {56                "name": "eve",57                "wsPort": 9888,58                "rpcPort": 9887,59                "port": 30888,60                "flags": [61                    "--unsafe-rpc-external",62                    "--unsafe-ws-external",63                    "-lparachain::candidate_validation=debug"64                ]65            }6667        ],68        "genesis": {69            "runtime": {70                "runtime_genesis_config": {71                    "parachainsConfiguration": {72                        "config": {73                            "validation_upgrade_frequency": 1,74                            "validation_upgrade_delay": 175                        }76                    }77                }78            }79        }80    },81    "parachains": [82        {83            "bin": "/unique-chain/target/release/unique-collator",84            "id": "2095",85            "balance": "1000000000000000000000000",86            "nodes": [87                {88                    "port": 31200,89                    "wsPort": 9944,90                    "rpcPort": 9933,91                    "name": "alice",92                    "flags": [93                       "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",94                       "--unsafe-rpc-external",95                       "--unsafe-ws-external"96		    ]97                }98            ]99        },100        {101            "bin": "/acala/target/release/acala",102            "id": "2000",103            "chain":  "karura-dev",104            "balance": "1000000000000000000000",105            "chainInitializer": [106                "chainql",107                "-e",108                "(import '${spec}') {id+: '-local'}"109            ],	              110            "nodes": [111                {112                    "wsPort": 9946,113                    "port": 31202,114                    "name": "alice",115                    "flags": [116                       "--unsafe-rpc-external",117                       "--unsafe-ws-external"118                     ]119                }120              ]121        },122        {123            "bin": "/moonbeam/target/release/moonbeam",124            "id": 2023,125            "balance": "1000000000000000000000",126            "chain": "moonriver-local",127            "chainInitializer": [128                "chainql",129                "--tla-code=spec=import '${spec}'",130                "minBondFix.jsonnet"131            ],		    132            "nodes": [133                {134                    "wsPort": 9947,135                    "port": 31203,136                    "name": "alice",137                    "flags": [138                       "--unsafe-rpc-external",139                       "--unsafe-ws-external",140                        "--",141                        "--execution=wasm"142                    ]143                }144            ]145        },146        {147            "bin": "/cumulus/target/release/cumulus",148            "id": "1000",149            "chain": "statemine-local",150            "balance": "1000000000000000000000000",151            "nodes": [152                {153                    "wsPort": 9948,154                    "port": 31204,155                    "name": "alice",156                    "flags": [157                       "--unsafe-rpc-external",158                       "--unsafe-ws-external"159                    ]160                }161            ]162        }163    ],164    "simpleParachains": [],165    "hrmpChannels": [166        {167            "sender": 2095,168            "recipient": 2000,169            "maxCapacity": 8,170            "maxMessageSize": 512171        },172        {173            "sender": 2000,174            "recipient": 2095,175            "maxCapacity": 8,176            "maxMessageSize": 512177        },178        {179            "sender": 2095,180            "recipient": 2023,181            "maxCapacity": 8,182            "maxMessageSize": 512183        },184        {185            "sender": 2023,186            "recipient": 2095,187            "maxCapacity": 8,188            "maxMessageSize": 512189        },190        {191            "sender": 2095,192            "recipient": 1000,193            "maxCapacity": 8,194            "maxMessageSize": 512195        },196        {197            "sender": 1000,198            "recipient": 2095,199            "maxCapacity": 8,200            "maxMessageSize": 512201        }202    ],203    "finalization": false204}205