git.delta.rocks / unique-network / refs/commits / fb2377a722b6

difftreelog

add RELAY_CHAIN_TYPE for forkless workflows

Unique2023-01-08parent: #f88f14a.patch.diff
in: master

10 files changed

modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -2,8 +2,8 @@
       "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
         "upgradeBin": "/polkadot/target/release/polkadot",
-        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",
-        "chain": "westend-local",
+        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "nodes": [
             {
                 "name": "alice",
modified.docker/forkless-config/launch-config-forkless-nodata.j2diffbeforeafterboth
before · .docker/forkless-config/launch-config-forkless-nodata.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/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_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,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",105                        "--ws-max-connections=1000",106                        "--",107                        "--port=31335",108                        "--ws-port=9745",109                        "--rpc-port=9734"110                    ]111                },112                {113                    "port": 31201,114                    "wsPort": 9945,115                    "rpcPort": 9934,116                    "name": "bob",117                    "flags": [118                        "--rpc-cors=all",119                        "--unsafe-rpc-external",120                        "--unsafe-ws-external",121                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",122                        "--ws-max-connections=1000",123                        "--",124                        "--port=31337",125                        "--ws-port=9747",126                        "--rpc-port=9737"                        127                    ]128                }129            ]130        }131    ],132    "simpleParachains": [],133    "hrmpChannels": [],134    "finalization": false135}
after · .docker/forkless-config/launch-config-forkless-nodata.j2
1{2      "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "upgradeBin": "/polkadot/target/release/polkadot",5        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",6        "chain": "{{ RELAY_CHAIN_TYPE }}-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/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_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,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",105                        "--ws-max-connections=1000",106                        "--",107                        "--port=31335",108                        "--ws-port=9745",109                        "--rpc-port=9734"110                    ]111                },112                {113                    "port": 31201,114                    "wsPort": 9945,115                    "rpcPort": 9934,116                    "name": "bob",117                    "flags": [118                        "--rpc-cors=all",119                        "--unsafe-rpc-external",120                        "--unsafe-ws-external",121                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",122                        "--ws-max-connections=1000",123                        "--",124                        "--port=31337",125                        "--ws-port=9747",126                        "--rpc-port=9737"                        127                    ]128                }129            ]130        }131    ],132    "simpleParachains": [],133    "hrmpChannels": [],134    "finalization": false135}
modified.docker/xcm-config/launch-config-xcm-opal.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-opal.j2
+++ b/.docker/xcm-config/launch-config-xcm-opal.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
modified.docker/xcm-config/launch-config-xcm-quartz.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
modified.docker/xcm-config/launch-config-xcm-unique.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 RUST_TOOLCHAIN=nightly-2022-11-15
 POLKADOT_BUILD_BRANCH=release-v0.9.36
 POLKADOT_LAUNCH_BRANCH=unique-network
-RELAY_CHAIN_TYPE=westend-local
+RELAY_CHAIN_TYPE=westend
 
 POLKADOT_MAINNET_BRANCH=release-v0.9.30
 STATEMINT_BUILD_BRANCH=release-parachains-v9320
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -95,6 +95,7 @@
             NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
             WASM_NAME=${{ matrix.wasm_name}}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-data.json
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -95,6 +95,7 @@
           variables: |
             NETWORK=${{ matrix.network }}
             WASM_NAME=${{ matrix.wasm_name }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -95,6 +95,7 @@
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
             NETWORK=${{ matrix.network }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -99,6 +99,7 @@
           variables: |
             NETWORK=${{ matrix.network }}
             WASM_NAME=${{ matrix.wasm_name }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json