difftreelog
ci remove ws-port leftovers
in: master
30 files changed
.docker/Dockerfile-collators.j2diffbeforeafterboth--- a/.docker/Dockerfile-collators.j2
+++ b/.docker/Dockerfile-collators.j2
@@ -53,7 +53,6 @@
EXPOSE 9844
EXPOSE 9944
-EXPOSE 9933
EXPOSE 9833
EXPOSE 40333
EXPOSE 30333
@@ -61,4 +60,4 @@
CMD export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
cd /polkadot-launch && \
- yarn start launch-config.json
\ No newline at end of file
+ yarn start launch-config.json
.docker/Dockerfile-testnet.j2diffbeforeafterboth--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -55,7 +55,6 @@
EXPOSE 9844
EXPOSE 9944
-EXPOSE 9933
EXPOSE 9833
EXPOSE 40333
EXPOSE 30333
.docker/Dockerfile-xcm.j2diffbeforeafterboth--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -63,7 +63,6 @@
COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/
EXPOSE 9844
-EXPOSE 9933
EXPOSE 9944
EXPOSE 9946
EXPOSE 9947
.docker/additional/xcm-rococo/launch-config-xcm-opal-rococo.jsondiffbeforeafterboth--- a/.docker/additional/xcm-rococo/launch-config-xcm-opal-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-opal-rococo.json
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -86,8 +81,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"--unsafe-rpc-external",
@@ -104,7 +98,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
.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
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -65,8 +60,7 @@
},
{
"name": "ferdie",
- "wsPort": 9899,
- "rpcPort": 9898,
+ "rpcPort": 9899,
"port": 30999,
"flags": [
"--unsafe-rpc-external",
@@ -96,8 +90,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
@@ -119,7 +112,7 @@
],
"nodes": [
{
- "wsPort": 9946,
+ "rpcPort": 9946,
"port": 31202,
"name": "alice",
"flags": [
@@ -137,7 +130,7 @@
"specNamePrefix": "moonriver-local-",
"nodes": [
{
- "wsPort": 9947,
+ "rpcPort": 9947,
"port": 31203,
"name": "alice",
"flags": [
@@ -156,7 +149,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
@@ -173,7 +166,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9949,
+ "rpcPort": 9949,
"port": 31205,
"name": "alice",
"flags": [
.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
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -65,8 +60,7 @@
},
{
"name": "ferdie",
- "wsPort": 9899,
- "rpcPort": 9898,
+ "rpcPort": 9899,
"port": 30999,
"flags": [
"--unsafe-rpc-external",
@@ -96,8 +90,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
@@ -119,7 +112,7 @@
],
"nodes": [
{
- "wsPort": 9946,
+ "rpcPort": 9946,
"port": 31202,
"name": "alice",
"flags": [
@@ -137,7 +130,7 @@
"specNamePrefix": "moonbeam-local-",
"nodes": [
{
- "wsPort": 9947,
+ "rpcPort": 9947,
"port": 31203,
"name": "alice",
"flags": [
@@ -156,7 +149,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
@@ -173,7 +166,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9949,
+ "rpcPort": 9949,
"port": 31205,
"name": "alice",
"flags": [
.docker/docker-compose.collators.j2diffbeforeafterboth--- a/.docker/docker-compose.collators.j2
+++ b/.docker/docker-compose.collators.j2
@@ -6,7 +6,5 @@
container_name: collator-selection-{{ NETWORK }}
expose:
- 9944
- - 9933
ports:
- 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
.docker/docker-compose.forkless-data.j2diffbeforeafterboth--- a/.docker/docker-compose.forkless-data.j2
+++ b/.docker/docker-compose.forkless-data.j2
@@ -6,7 +6,6 @@
container_name: forkless-data-{{ NETWORK }}
expose:
- 9944
- - 9933
- 33044
- 33055
- 33066
@@ -16,7 +15,6 @@
- 33155
ports:
- 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
- 127.0.0.1:33044:33044
- 127.0.0.1:33055:33055
- 127.0.0.1:33066:33066
.docker/docker-compose.forkless-nodata.j2diffbeforeafterboth--- a/.docker/docker-compose.forkless-nodata.j2
+++ b/.docker/docker-compose.forkless-nodata.j2
@@ -6,7 +6,5 @@
container_name: forkless-nodata
expose:
- 9944
- - 9933
ports:
- 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
\ No newline at end of file
.docker/docker-compose.tmp-dev.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -12,10 +12,8 @@
container_name: node-dev
expose:
- 9944
- - 9933
ports:
- 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
logging:
options:
max-size: "1m"
.docker/docker-compose.tmp-node.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-node.j2
+++ b/.docker/docker-compose.tmp-node.j2
@@ -25,12 +25,10 @@
expose:
- 9944
- 9945
- - 9933
- 9844
ports:
- 127.0.0.1:9944:9944
- 127.0.0.1:9945:9945
- - 127.0.0.1:9933:9933
- 127.0.0.1:9844:9844
logging:
options:
.docker/docker-compose.try-runtime.j2diffbeforeafterboth--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -6,8 +6,6 @@
container_name: try-runtime
expose:
- 9944
- - 9933
ports:
- 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
.docker/docker-compose.xcm.j2diffbeforeafterboth--- a/.docker/docker-compose.xcm.j2
+++ b/.docker/docker-compose.xcm.j2
@@ -6,7 +6,6 @@
container_name: xcm-{{ NETWORK }}-local
expose:
- 9844
- - 9933
- 9944
- 9946
- 9947
@@ -14,7 +13,6 @@
- 9949
ports:
- 127.0.0.1:9844:9844
- - 127.0.0.1:9933:9933
- 127.0.0.1:9944:9944
- 127.0.0.1:9946:9946
- 127.0.0.1:9947:9947
.docker/forkless-config/launch-config-forkless-nodata.j2diffbeforeafterboth--- a/.docker/forkless-config/launch-config-forkless-nodata.j2
+++ b/.docker/forkless-config/launch-config-forkless-nodata.j2
@@ -7,8 +7,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -20,8 +19,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -33,8 +31,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -46,8 +43,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -59,8 +55,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -94,8 +89,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"--rpc-cors=all",
@@ -111,8 +105,7 @@
},
{
"port": 31201,
- "wsPort": 9945,
- "rpcPort": 9934,
+ "rpcPort": 9945,
"name": "bob",
"flags": [
"--rpc-cors=all",
.docker/forkless-config/zombienet-forkless-data.tomldiffbeforeafterboth--- a/.docker/forkless-config/zombienet-forkless-data.toml
+++ b/.docker/forkless-config/zombienet-forkless-data.toml
@@ -8,8 +8,7 @@
[[relaychain.nodes]]
name = "relay-alice"
- ws_port = 9844
- rpc_port = 9843
+ rpc_port = 9844
p2p_port = 30444
prometheus_port = 33044
prometheus = false
@@ -18,8 +17,7 @@
[[relaychain.nodes]]
name = "relay-bob"
- ws_port = 9855
- rpc_port = 9854
+ rpc_port = 9855
p2p_port = 30555
prometheus_port = 33055
prometheus = false
@@ -28,8 +26,7 @@
[[relaychain.nodes]]
name = "relay-charlie"
- ws_port = 9866
- rpc_port = 9865
+ rpc_port = 9866
p2p_port = 30666
prometheus_port = 33066
prometheus = false
@@ -38,8 +35,7 @@
[[relaychain.nodes]]
name = "relay-dave"
- ws_port = 9877
- rpc_port = 9876
+ rpc_port = 9877
p2p_port = 30777
prometheus_port = 33077
prometheus = false
@@ -48,8 +44,7 @@
[[relaychain.nodes]]
name = "relay-eve"
- ws_port = 9888
- rpc_port = 9887
+ rpc_port = 9888
p2p_port = 3088
prometheus_port = 33088
prometheus = false
@@ -68,8 +63,7 @@
[[parachains.collators]]
name = "alice"
command = "/unique-chain/current/release/unique-collator"
- ws_port = 9944
- rpc_port = 9933
+ rpc_port = 9944
p2p_port = 31200
prometheus_port = 33144
prometheus = false
@@ -80,8 +74,7 @@
[[parachains.collators]]
name = "bob"
command = "/unique-chain/current/release/unique-collator"
- ws_port = 9945
- rpc_port = 9934
+ rpc_port = 9945
p2p_port = 31201
prometheus_port = 33155
prometheus = false
.docker/forkless-config/zombienet-forkless-nodata.tomldiffbeforeafterboth--- a/.docker/forkless-config/zombienet-forkless-nodata.toml
+++ b/.docker/forkless-config/zombienet-forkless-nodata.toml
@@ -8,8 +8,7 @@
[[relaychain.nodes]]
name = "relay-alice"
- ws_port = 9844
- rpc_port = 9843
+ rpc_port = 9844
p2p_port = 30444
[[relaychain.node_groups]]
@@ -22,8 +21,7 @@
[[parachains.collators]]
name = "alice"
command = "/unique-chain/current/release/unique-collator"
- ws_port = 9944
- rpc_port = 9933
+ rpc_port = 9944
p2p_port = 31200
args = [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
@@ -33,8 +31,7 @@
[[parachains.collators]]
name = "bob"
command = "/unique-chain/current/release/unique-collator"
- ws_port = 9945
- rpc_port = 9934
+ rpc_port = 9945
p2p_port = 31201
args = [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
.docker/testnet-config/launch-config.jsondiffbeforeafterboth--- a/.docker/testnet-config/launch-config.json
+++ b/.docker/testnet-config/launch-config.json
@@ -5,8 +5,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -18,8 +17,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -31,8 +29,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -44,8 +41,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -57,8 +53,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"-lparachain::candidate_validation=debug",
@@ -90,8 +85,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"--rpc-cors=all",
@@ -102,8 +96,7 @@
},
{
"port": 31201,
- "wsPort": 9945,
- "rpcPort": 9934,
+ "rpcPort": 9945,
"name": "bob",
"flags": [
"--rpc-cors=all",
@@ -114,8 +107,7 @@
},
{
"port": 31202,
- "wsPort": 9946,
- "rpcPort": 9935,
+ "rpcPort": 9946,
"name": "charlie",
"flags": [
"--rpc-cors=all",
@@ -126,8 +118,7 @@
},
{
"port": 31203,
- "wsPort": 9947,
- "rpcPort": 9936,
+ "rpcPort": 9947,
"name": "dave",
"flags": [
"--rpc-cors=all",
@@ -138,8 +129,7 @@
},
{
"port": 31204,
- "wsPort": 9948,
- "rpcPort": 9937,
+ "rpcPort": 9948,
"name": "eve",
"flags": [
"--rpc-cors=all",
.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
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -86,8 +81,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"--unsafe-rpc-external",
@@ -104,7 +98,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
.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
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -65,8 +60,7 @@
},
{
"name": "ferdie",
- "wsPort": 9899,
- "rpcPort": 9898,
+ "rpcPort": 9899,
"port": 30999,
"flags": [
"--unsafe-rpc-external",
@@ -96,8 +90,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
@@ -119,7 +112,7 @@
],
"nodes": [
{
- "wsPort": 9946,
+ "rpcPort": 9946,
"port": 31202,
"name": "alice",
"flags": [
@@ -137,7 +130,7 @@
"specNamePrefix": "moonriver-local-",
"nodes": [
{
- "wsPort": 9947,
+ "rpcPort": 9947,
"port": 31203,
"name": "alice",
"flags": [
@@ -156,7 +149,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
@@ -173,7 +166,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9949,
+ "rpcPort": 9949,
"port": 31205,
"name": "alice",
"flags": [
.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
@@ -10,8 +10,7 @@
"nodes": [
{
"name": "alice",
- "wsPort": 9844,
- "rpcPort": 9843,
+ "rpcPort": 9844,
"port": 30444,
"flags": [
"--unsafe-rpc-external",
@@ -21,8 +20,7 @@
},
{
"name": "bob",
- "wsPort": 9855,
- "rpcPort": 9854,
+ "rpcPort": 9855,
"port": 30555,
"flags": [
"--unsafe-rpc-external",
@@ -32,8 +30,7 @@
},
{
"name": "charlie",
- "wsPort": 9866,
- "rpcPort": 9865,
+ "rpcPort": 9866,
"port": 30666,
"flags": [
"--unsafe-rpc-external",
@@ -43,8 +40,7 @@
},
{
"name": "dave",
- "wsPort": 9877,
- "rpcPort": 9876,
+ "rpcPort": 9877,
"port": 30777,
"flags": [
"--unsafe-rpc-external",
@@ -54,8 +50,7 @@
},
{
"name": "eve",
- "wsPort": 9888,
- "rpcPort": 9887,
+ "rpcPort": 9888,
"port": 30888,
"flags": [
"--unsafe-rpc-external",
@@ -65,8 +60,7 @@
},
{
"name": "ferdie",
- "wsPort": 9899,
- "rpcPort": 9898,
+ "rpcPort": 9899,
"port": 30999,
"flags": [
"--unsafe-rpc-external",
@@ -96,8 +90,7 @@
"nodes": [
{
"port": 31200,
- "wsPort": 9944,
- "rpcPort": 9933,
+ "rpcPort": 9944,
"name": "alice",
"flags": [
"-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",
@@ -119,7 +112,7 @@
],
"nodes": [
{
- "wsPort": 9946,
+ "rpcPort": 9946,
"port": 31202,
"name": "alice",
"flags": [
@@ -137,7 +130,7 @@
"specNamePrefix": "moonbeam-local-",
"nodes": [
{
- "wsPort": 9947,
+ "rpcPort": 9947,
"port": 31203,
"name": "alice",
"flags": [
@@ -156,7 +149,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9948,
+ "rpcPort": 9948,
"port": 31204,
"name": "alice",
"flags": [
@@ -173,7 +166,7 @@
"balance": "1000000000000000000000000",
"nodes": [
{
- "wsPort": 9949,
+ "rpcPort": 9949,
"port": 31205,
"name": "alice",
"flags": [
.github/workflows/collator-selection.ymldiffbeforeafterboth--- a/.github/workflows/collator-selection.yml
+++ b/.github/workflows/collator-selection.yml
@@ -240,7 +240,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn testCollators --reporter mochawesome --reporter-options reportFilename=test-collators-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
- name: Test Report Collator
uses: phoenix-actions/test-reporting@v8
.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -271,7 +271,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
- name: Test Report Parallel
uses: phoenix-actions/test-reporting@v10
@@ -294,7 +294,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
- name: Test Report Sequential
uses: phoenix-actions/test-reporting@v10
.github/workflows/market-test.ymldiffbeforeafterboth--- a/.github/workflows/market-test.yml
+++ b/.github/workflows/market-test.yml
@@ -125,7 +125,7 @@
# ./scripts/wait_for_first_block.sh
# echo "Ready to start tests"
# env:
-# RPC_URL: http://127.0.0.1:9933/
+# RPC_URL: http://127.0.0.1:9944/
- name: Wait for chain up and running
run: |
.github/workflows/node-only-update.ymldiffbeforeafterboth--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -174,7 +174,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
# - name: Upload Parallel Test Report Before Node upgrade
# uses: phoenix-actions/test-reporting@v8
@@ -191,7 +191,7 @@
working-directory: ${{ matrix.mainnet_branch }}/tests
run: NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
# - name: Upload Sequential Test Report Before Node upgrade
# uses: phoenix-actions/test-reporting@v10
@@ -297,7 +297,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
#- name: Test Report Parallel After Node upgrade
# uses: phoenix-actions/test-reporting@v10
@@ -314,7 +314,7 @@
working-directory: ${{ matrix.mainnet_branch }}/tests
run: NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
#- name: Upload Sequential Test Report After Node upgrade
# uses: phoenix-actions/test-reporting@v10
.github/workflows/polkadot-types.ymldiffbeforeafterboth--- a/.github/workflows/polkadot-types.yml
+++ b/.github/workflows/polkadot-types.yml
@@ -82,7 +82,7 @@
git config --global user.email github-actions@usetech.com
/bin/bash ./scripts/generate_types_package.sh --release ${{ matrix.usage }} --push
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
- name: Stop running containers
if: always() # run this step always
.github/workflows/xcm.ymldiffbeforeafterboth1name: xcm-testnet-build23# Controls when the action will run.4on:5 workflow_call:6 7 # Allows you to run this workflow manually from the Actions tab8 workflow_dispatch:910#Define Workflow variables11env:12 REPO_URL: ${{ github.server_url }}/${{ github.repository }}1314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:1617 prepare-execution-marix:1819 name: Prepare execution matrix2021 runs-on: [self-hosted-ci]22 outputs:23 matrix: ${{ steps.create_matrix.outputs.matrix }}2425 steps:2627 - name: Clean Workspace28 uses: AutoModality/action-clean@v1.1.02930 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it31 - uses: actions/checkout@v3.1.032 with:33 ref: ${{ github.head_ref }} #Checking out head commit3435 - name: Read .env file36 uses: xom9ikk/dotenv@v23738 - name: Create Execution matrix39 uses: CertainLach/create-matrix-action@v440 id: create_matrix41 with:42 matrix: |43 network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.WESTMINT_BUILD_BRANCH }}}, astar_version {${{ env.ASTAR_BUILD_BRANCH }}}, runtest {testXcmOpal}44 network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, acala_version {${{ env.KARURA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONRIVER_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINE_BUILD_BRANCH }}}, astar_version {${{ env.SHIDEN_BUILD_BRANCH }}}, runtest {testXcmQuartz}45 network {unique}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINT_BUILD_BRANCH }}}, astar_version {${{ env.ASTAR_BUILD_BRANCH }}}, runtest {testXcmUnique}4647 xcm-build:48 49 needs: prepare-execution-marix50 # The type of runner that the job will run on51 runs-on: [XL]5253 timeout-minutes: 6005455 name: ${{ matrix.network }}-build5657 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.5859 strategy:60 matrix:61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}6263 steps:64 - name: Skip if pull request is in Draft65 if: github.event.pull_request.draft == true66 run: exit 16768 - name: Clean Workspace69 uses: AutoModality/action-clean@v1.1.07071 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it72 - uses: actions/checkout@v3.1.073 with:74 ref: ${{ github.head_ref }} #Checking out head commit7576 # Prepare SHA 77 - name: Prepare SHA78 uses: ./.github/actions/prepare7980 - name: Read .env file81 uses: xom9ikk/dotenv@v28283 - name: Log in to Docker Hub84 uses: docker/login-action@v2.1.085 with:86 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}87 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}8889 # Check POLKADOT version and build it if it doesn't exist in repository90 - name: Generate ENV related extend Dockerfile file for POLKADOT91 uses: cuchi/jinja2-action@v1.2.092 with:93 template: .docker/Dockerfile-polkadot.j294 output_file: .docker/Dockerfile-polkadot.${{ matrix.relay_branch }}.yml95 variables: |96 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}97 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}9899 - name: Check if the dockerhub repository contains the needed version POLKADOT100 run: |101 # aquire token102 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)103 export TOKEN=$TOKEN104105 # Get TAGS from DOCKERHUB POLKADOT repository106 POLKADOT_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-polkadot/tags/?page_size=100 | jq -r '."results"[]["name"]')107 # Show TAGS108 echo "POLKADOT TAGS:"109 echo $POLKADOT_TAGS110 # Check correct version POLKADOT and build it if it doesn't exist in POLKADOT TAGS111 if [[ ${POLKADOT_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.relay_branch }}"($|[[:space:]]) ]]; then112 echo "Repository has needed POLKADOT version";113 docker pull uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}114 else115 echo "Repository has not needed POLKADOT version, so build it";116 cd .docker/ && docker build --no-cache --file ./Dockerfile-polkadot.${{ matrix.relay_branch }}.yml --tag uniquenetwork/builder-polkadot:${{ matrix.relay_branch }} .117 echo "Push needed POLKADOT version to the repository";118 docker push uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}119 fi120 shell: bash121122 # Check ACALA version and build it if it doesn't exist in repository123 - name: Generate ENV related extend Dockerfile file for ACALA124 uses: cuchi/jinja2-action@v1.2.0125 with:126 template: .docker/Dockerfile-acala.j2127 output_file: .docker/Dockerfile-acala.${{ matrix.acala_version }}.yml128 variables: |129 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}130 ACALA_BUILD_BRANCH=${{ matrix.acala_version }}131132 - name: Check if the dockerhub repository contains the needed ACALA version133 run: |134 # aquire token135 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)136 export TOKEN=$TOKEN137138 # Get TAGS from DOCKERHUB repository139 ACALA_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-acala/tags/?page_size=100 | jq -r '."results"[]["name"]')140 # Show TAGS141 echo "ACALA TAGS:"142 echo $ACALA_TAGS143 # Check correct version ACALA and build it if it doesn't exist in ACALA TAGS144 if [[ ${ACALA_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.acala_version }}"($|[[:space:]]) ]]; then145 echo "Repository has needed ACALA version";146 docker pull uniquenetwork/builder-acala:${{ matrix.acala_version }}147 else148 echo "Repository has not needed ACALA version, so build it";149 cd .docker/ && docker build --no-cache --file ./Dockerfile-acala.${{ matrix.acala_version }}.yml --tag uniquenetwork/builder-acala:${{ matrix.acala_version }} .150 echo "Push needed ACALA version to the repository";151 docker push uniquenetwork/builder-acala:${{ matrix.acala_version }}152 fi153 shell: bash154155 # Check MOONBEAM version and build it if it doesn't exist in repository156 - name: Generate ENV related extend Dockerfile file for MOONBEAM157 uses: cuchi/jinja2-action@v1.2.0158 with:159 template: .docker/Dockerfile-moonbeam.j2160 output_file: .docker/Dockerfile-moonbeam.${{ matrix.moonbeam_version }}.yml161 variables: |162 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}163 MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}164165 - name: Check if the dockerhub repository contains the needed MOONBEAM version166 run: |167 # aquire token168 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)169 export TOKEN=$TOKEN170171 # Get TAGS from DOCKERHUB repository172 MOONBEAM_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-moonbeam/tags/?page_size=100 | jq -r '."results"[]["name"]')173 # Show TAGS174 echo "MOONBEAM TAGS:"175 echo $MOONBEAM_TAGS176 # Check correct version MOONBEAM and build it if it doesn't exist in MOONBEAM TAGS177 if [[ ${MOONBEAM_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.moonbeam_version }}"($|[[:space:]]) ]]; then178 echo "Repository has needed MOONBEAM version";179 docker pull uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}180 else181 echo "Repository has not needed MOONBEAM version, so build it";182 cd .docker/ && docker build --no-cache --file ./Dockerfile-moonbeam.${{ matrix.moonbeam_version }}.yml --tag uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }} .183 echo "Push needed MOONBEAM version to the repository";184 docker push uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}185 fi186 shell: bash187188 # Check CUMULUS version and build it if it doesn't exist in repository189 - name: Generate ENV related extend Dockerfile file for CUMULUS190 uses: cuchi/jinja2-action@v1.2.0191 with:192 template: .docker/Dockerfile-cumulus.j2193 output_file: .docker/Dockerfile-cumulus.${{ matrix.cumulus_version }}.yml194 variables: |195 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}196 CUMULUS_BUILD_BRANCH=${{ matrix.cumulus_version }}197198 - name: Check if the dockerhub repository contains the needed CUMULUS version199 run: | 200 # aquire token201 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)202 export TOKEN=$TOKEN203204 # Get TAGS from DOCKERHUB repository205 CUMULUS_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-cumulus/tags/?page_size=100 | jq -r '."results"[]["name"]')206 # Show TAGS207 echo "CUMULUS TAGS:"208 echo $CUMULUS_TAGS209 # Check correct version CUMULUS and build it if it doesn't exist in CUMULUS TAGS210 if [[ ${CUMULUS_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.cumulus_version }}"($|[[:space:]]) ]]; then211 echo "Repository has needed CUMULUS version";212 docker pull uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}213 else214 echo "Repository has not needed CUMULUS version, so build it";215 cd .docker/ && docker build --no-cache --file ./Dockerfile-cumulus.${{ matrix.cumulus_version }}.yml --tag uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }} .216 echo "Push needed CUMULUS version to the repository";217 docker push uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}218 fi219 shell: bash220221 # Check ASTAR version and build it if it doesn't exist in repository222 - name: Generate ENV related extend Dockerfile file for ASTAR223 uses: cuchi/jinja2-action@v1.2.0224 with:225 template: .docker/Dockerfile-astar.j2226 output_file: .docker/Dockerfile-astar.${{ matrix.astar_version }}.yml227 variables: |228 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}229 ASTAR_BUILD_BRANCH=${{ matrix.astar_version }}230231 - name: Check if the dockerhub repository contains the needed ASTAR version232 run: |233 # aquire token234 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)235 export TOKEN=$TOKEN236237 # Get TAGS from DOCKERHUB repository238 ASTAR_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-astar/tags/?page_size=100 | jq -r '."results"[]["name"]')239 # Show TAGS240 echo "ASTAR TAGS:"241 echo $ASTAR_TAGS242 # Check correct version ASTAR and build it if it doesn't exist in ASTAR TAGS243 if [[ ${ASTAR_TAGS[*]} =~ (^|[[:space:]])"${{ matrix.astar_version }}"($|[[:space:]]) ]]; then244 echo "Repository has needed ASTAR version";245 docker pull uniquenetwork/builder-astar:${{ matrix.astar_version }}246 else247 echo "Repository has not needed ASTAR version, so build it";248 cd .docker/ && docker build --no-cache --file ./Dockerfile-astar.${{ matrix.astar_version }}.yml --tag uniquenetwork/builder-astar:${{ matrix.astar_version }} .249 echo "Push needed ASTAR version to the repository";250 docker push uniquenetwork/builder-astar:${{ matrix.astar_version }}251 fi252 shell: bash253254255 # Check CHAINQL version and build it if it doesn't exist in repository256 - name: Generate ENV related extend Dockerfile file for CHAINQL257 uses: cuchi/jinja2-action@v1.2.0258 with:259 template: .docker/Dockerfile-chainql.j2260 output_file: .docker/Dockerfile-chainql.${{ env.CHAINQL }}.yml261 variables: |262 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}263 CHAINQL=${{ env.CHAINQL }}264265 - name: Check if the dockerhub repository contains the needed CHAINQL version266 run: |267 # aquire token268 TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.CORE_DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.CORE_DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)269 export TOKEN=$TOKEN270271 # Get TAGS from DOCKERHUB repository272 CHAINQL_TAGS=$(curl -s -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/uniquenetwork/builder-chainql/tags/?page_size=100 | jq -r '."results"[]["name"]')273 # Show TAGS274 echo "CHAINQL TAGS:"275 echo $CHAINQL_TAGS276 # Check correct version CHAINQL and build it if it doesn't exist in CHAINQL TAGS277 if [[ ${CHAINQL_TAGS[*]} =~ (^|[[:space:]])"${{ env.CHAINQL }}"($|[[:space:]]) ]]; then278 echo "Repository has needed CHAINQL version";279 docker pull uniquenetwork/builder-chainql:${{ env.CHAINQL }}280 else281 echo "Repository has not needed CHAINQL version, so build it";282 cd .docker/ && docker build --no-cache --file ./Dockerfile-chainql.${{ env.CHAINQL }}.yml --tag uniquenetwork/builder-chainql:${{ env.CHAINQL }} .283 echo "Push needed CHAINQL version to the repository";284 docker push uniquenetwork/builder-chainql:${{ env.CHAINQL }}285 fi286 shell: bash287288 # - name: Pull chainql docker image289 # run: docker pull uniquenetwork/builder-chainql:${{ env.CHAINQL }}290291 - name: Generate ENV related extend launch-config file292 uses: cuchi/jinja2-action@v1.2.0293 with:294 template: .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.j2295 output_file: .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json296 variables: |297 RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }} 298299 - name: Show launch-config-xcm-${{ matrix.network }} configuration300 run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json301302 # Build main image for XCM 303 - name: Generate ENV related extend Dockerfile file304 uses: cuchi/jinja2-action@v1.2.0305 with:306 template: .docker/Dockerfile-xcm.j2307 output_file: .docker/Dockerfile-xcm.${{ matrix.network }}.yml308 variables: |309 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}310 NETWORK=${{ matrix.network }}311 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}312 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }} 313 BRANCH=${{ github.head_ref }}314 ACALA_BUILD_BRANCH=${{ matrix.acala_version }}315 ASTAR_BUILD_BRANCH=${{ matrix.astar_version }}316 MOONBEAM_BUILD_BRANCH=${{ matrix.moonbeam_version }}317 CUMULUS_BUILD_BRANCH=${{ matrix.cumulus_version }}318 CHAINQL=${{ env.CHAINQL }}319320 - name: Show build Dockerfile321 run: cat .docker/Dockerfile-xcm.${{ matrix.network }}.yml322323 - name: Run find-and-replace to remove slashes from branch name324 uses: mad9000/actions-find-and-replace-string@4325 id: branchname326 with:327 source: ${{ github.head_ref }}328 find: '/'329 replace: '-'330331 - name: Set build SHA332 shell: bash333 run: |334 echo "BUILD_SHA=${LAST_COMMIT_SHA:0:8}" >> $GITHUB_ENV335336 - name: Build the stack337 run: cd .docker/ && docker build --no-cache --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-$BUILD_SHA .338339 - name: Push docker image version340 run: docker push uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-$BUILD_SHA341342 - name: Remove builder cache343 if: always() # run this step always344 run: |345 docker builder prune -f346 docker system prune -f347348 xcm-tests:349 needs: [prepare-execution-marix, xcm-build]350 # The type of runner that the job will run on351 runs-on: [XL]352353 timeout-minutes: 600354355 name: ${{ matrix.network }}-tests356357 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.358359 strategy:360 matrix:361 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}362363 steps:364 - name: Skip if pull request is in Draft365 if: github.event.pull_request.draft == true366 run: exit 1367368 - name: Clean Workspace369 uses: AutoModality/action-clean@v1.1.0370371 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it372 - uses: actions/checkout@v3.1.0373 with:374 ref: ${{ github.head_ref }} #Checking out head commit375376 - name: Prepare377 uses: ./.github/actions/prepare378379 - name: Set build SHA380 shell: bash381 run: |382 echo "BUILD_SHA=${LAST_COMMIT_SHA:0:8}" >> $GITHUB_ENV383384 - name: Run find-and-replace to remove slashes from branch name385 uses: mad9000/actions-find-and-replace-string@4386 id: branchname387 with:388 source: ${{ github.head_ref }}389 find: '/'390 replace: '-'391392 - name: Read .env file393 uses: xom9ikk/dotenv@v2394395 - name: Generate ENV related extend file for docker-compose396 uses: cuchi/jinja2-action@v1.2.0397 with:398 template: .docker/docker-compose.xcm.j2399 output_file: .docker/docker-compose.xcm.${{ matrix.network }}.yml400 variables: |401 NETWORK=${{ matrix.network }}402 BUILD_TAG=${{ steps.branchname.outputs.value }}-$BUILD_SHA403404 - name: Show build configuration405 run: cat .docker/docker-compose.xcm.${{ matrix.network }}.yml406407 - uses: actions/setup-node@v3.5.1408 with:409 node-version: 16410411 - name: Log in to Docker Hub412 uses: docker/login-action@v2.1.0413 with:414 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}415 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}416417 - name: Build the stack418 run: docker-compose -f ".docker/docker-compose.xcm.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 300419420 # 🚀 POLKADOT LAUNCH COMPLETE 🚀421 - name: Check if docker logs consist messages related to testing of xcm tests 422 if: success()423 run: |424 counter=160425 function check_container_status {426 docker inspect -f {{.State.Running}} xcm-${{ matrix.network }}-local427 }428 function do_docker_logs {429 docker logs --details xcm-${{ matrix.network }}-local 2>&1430 }431 function is_started {432 if [ "$(check_container_status)" == "true" ]; then433 echo "Container: xcm-${{ matrix.network }}-local RUNNING";434 echo "Check Docker logs"435 DOCKER_LOGS=$(do_docker_logs)436 if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then437 echo "🚀 POLKADOT LAUNCH COMPLETE 🚀"438 return 0439 else440 echo "Message not found in logs output, repeating..."441 return 1442 fi443 else444 echo "Container xcm-${{ matrix.network }}-local NOT RUNNING"445 echo "Halting all future checks"446 exit 1447 fi448 echo "something goes wrong"449 exit 1450 }451 while ! is_started; do452 echo "Waiting for special message in log files "453 sleep 30s454 counter=$(( $counter - 1 ))455 echo "Counter: $counter"456 if [ "$counter" -gt "0" ]; then457 continue458 else459 break460 fi461 done462 echo "Halting script"463 exit 0464 shell: bash465466 - name: Run XCM tests 467 working-directory: tests468 run: |469 yarn install470 yarn add mochawesome471 ./scripts/wait_for_first_block.sh472 echo "Ready to start tests"473 yarn polkadot-types 474 NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}475 env:476 RPC_URL: http://127.0.0.1:9933/477478 - name: XCM Test Report479 uses: phoenix-actions/test-reporting@v10480 id: test-report481 if: success() || failure() # run this step even if previous step failed482 with:483 name: XCM Tests ${{ matrix.network }} # Name of the check run which will be created484 path: tests/mochawesome-report/test-*.json # Path to test results485 reporter: mochawesome-json486 fail-on-error: 'false'487488 - name: Show container logs489 if: always() # run this step always490 run: docker-compose -f ".docker/docker-compose.xcm.${{ matrix.network }}.yml" logs491492 - name: Stop running containers493 if: always() # run this step always494 run: docker-compose -f ".docker/docker-compose.xcm.${{ matrix.network }}.yml" down495496 - name: Clean Workspace497 if: always()498 uses: AutoModality/action-clean@v1.1.0499500 - name: Remove builder cache501 if: always() # run this step always502 run: |503 docker system prune -a -f.github/workflows/yarn-dev.ymldiffbeforeafterboth--- a/.github/workflows/yarn-dev.yml
+++ b/.github/workflows/yarn-dev.yml
@@ -71,7 +71,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
env:
- RPC_URL: http://127.0.0.1:9933/
+ RPC_URL: http://127.0.0.1:9944/
- name: Test Report
uses: phoenix-actions/test-reporting@v10
@@ -125,4 +125,4 @@
# - name: Decide whether the needed jobs succeeded or failed
# uses: re-actors/alls-green@v1.2.2
# with:
- # jobs: ${{ toJSON(needs) }}
\ No newline at end of file
+ # jobs: ${{ toJSON(needs) }}
.gitignorediffbeforeafterboth--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,6 @@
cumulus-parachain/
*genesis
*wasm
-tmp/
\ No newline at end of file
+tmp/
+
+*.log
launch-zombienet.tomldiffbeforeafterboth--- a/launch-zombienet.toml
+++ b/launch-zombienet.toml
@@ -11,8 +11,7 @@
[[relaychain.nodes]]
name = "relay-alice"
- ws_port = 9844
- rpc_port = 9843
+ rpc_port = 9844
p2p_port = 30444
# Zombienet does not grant the default balance to nodes created with [[nodes]].
balance = 2000000000000
@@ -28,8 +27,7 @@
name = "alice"
# PARA_DIR is an environment variable. If you're launching ZN from the repository's root, you should likely specify it as ./
command = "{{PARA_DIR}}target/release/unique-collator"
- ws_port = 9944
- rpc_port = 9933
+ rpc_port = 9944
p2p_port = 31200
args = [ "-lxcm=trace", ]
@@ -37,7 +35,6 @@
name = "bob"
# PARA_DIR is an environment variable. If you're launching ZN from the repository's root, you should likely specify it as ./
command = "{{PARA_DIR}}target/release/unique-collator"
- ws_port = 9945
- rpc_port = 9934
+ rpc_port = 9945
p2p_port = 31201
args = [ "-lxcm=trace", ]
tests/scripts/generate_types_package.shdiffbeforeafterboth--- a/tests/scripts/generate_types_package.sh
+++ b/tests/scripts/generate_types_package.sh
@@ -9,7 +9,7 @@
. $DIR/functions.sh
usage() {
- echo "Usage: [RPC_URL=http://localhost:9944] $0 <--rc|--release> [--force] [--push] [--rpc-url=http://localhost:9933]" 1>&2
+ echo "Usage: [RPC_URL=http://localhost:9944] $0 <--rc|--release> [--force] [--push] [--rpc-url=http://localhost:9944]" 1>&2
exit 1
}