git.delta.rocks / unique-network / refs/commits / 04959868b343

difftreelog

Update due to found polkadot-launch requirements for upgrade.

Alexander Aksenov2022-08-10parent: #0098859.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -58,6 +58,8 @@
 RUN git clone $REPO_URL -b $BRANCH .
 RUN cargo build --features=$FEATURE --$PROFILE
 
+RUN ls -la /unique_parachain
+RUN ls -la /unique_parachain/target/release/wbuild
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -76,6 +78,9 @@
 
 FROM ubuntu:20.04
 
+ARG RUNTIME=
+ENV RUNTIME $RUNTIME
+
 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 && \
@@ -92,9 +97,15 @@
     npm install --global yarn && \
     yarn install
 
+RUN echo "$RUNTIME"
+
 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-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=builder-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
+				      
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/docker-compose.tmp-forkless.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless.j2
+++ b/.docker/docker-compose.tmp-forkless.j2
@@ -8,6 +8,7 @@
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
+        - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
modified.docker/launch-config.j2diffbeforeafterboth
before · .docker/launch-config.j2
1{2      "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "upgradeBin": "/polkadot/target/release/polkadot",5        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",6        "chain": "westend-local",7        "nodes": [8            {9                "name": "alice",10                "wsPort": 9844,11                "rpcPort": 9843,12                "port": 30444,13                "flags": [14                    "-lparachain::candidate_validation=debug",15                    "-lxcm=trace",16                    "--rpc-cors=all",17                    "--unsafe-rpc-external",18                    "--unsafe-ws-external"19                ]20            },21            {22                "name": "bob",23                "wsPort": 9855,24                "rpcPort": 9854,25                "port": 30555,26                "flags": [27                    "-lparachain::candidate_validation=debug",28                    "-lxcm=trace",29                    "--rpc-cors=all",30                    "--unsafe-rpc-external",31                    "--unsafe-ws-external"32                ]33            },34            {35                "name": "charlie",36                "wsPort": 9866,37                "rpcPort": 9865,38                "port": 30666,39                "flags": [40                    "-lparachain::candidate_validation=debug",41                    "-lxcm=trace",42                    "--rpc-cors=all",43                    "--unsafe-rpc-external",44                    "--unsafe-ws-external"45                ]46            },47            {48                "name": "dave",49                "wsPort": 9877,50                "rpcPort": 9876,51                "port": 30777,52                "flags": [53                    "-lparachain::candidate_validation=debug",54                    "-lxcm=trace",55                    "--rpc-cors=all",56                    "--unsafe-rpc-external",57                    "--unsafe-ws-external"58                ]59            },60            {61                "name": "eve",62                "wsPort": 9888,63                "rpcPort": 9887,64                "port": 30888,65                "flags": [66                    "-lparachain::candidate_validation=debug",67                    "-lxcm=trace",68                    "--rpc-cors=all",69                    "--unsafe-rpc-external",70                    "--unsafe-ws-external"71                ]72            }73        ],74        "genesis": {75            "runtime": {76                "runtime_genesis_config": {77                    "parachainsConfiguration": {78                        "config": {79                            "validation_upgrade_frequency": 1,80                            "validation_upgrade_delay": 181                        }82                    }83                }84            }85        }86    },87      "parachains": [88        {89            "bin": "../unique-chain/current/release/unique-collator",90            "upgradeBin": "../unique-chain/target/release/unique-collator",91            "upgradeWasm": "../unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",92            "id": "1000",93            "balance": "1000000000000000000000000",94            "nodes": [95                {96                    "port": 31200,97                    "wsPort": 9944,98                    "rpcPort": 9933,99                    "name": "alice",100                    "flags": [101                        "--rpc-cors=all",102                        "--unsafe-rpc-external",103                        "--unsafe-ws-external",104                        "-lxcm=trace"105                    ]106                },107                {108                    "port": 31201,109                    "wsPort": 9945,110                    "rpcPort": 9934,111                    "name": "bob",112                    "flags": [113                        "--rpc-cors=all",114                        "--unsafe-rpc-external",115                        "--unsafe-ws-external",116                        "-lxcm=trace"117                    ]118                }119            ]120        }121    ],122    "simpleParachains": [],123    "hrmpChannels": [],124    "finalization": false125}
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -90,6 +90,7 @@
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
             FEATURE=${{ matrix.features }}
+            RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration