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.ymldiffbeforeafterboth1# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586837021/Forkless+update+without+data2# Forkless update without data replication34# Triger: only call from main workflow(re-usable workflows)5on:6 workflow_call:789# A workflow run is made up of one or more jobs that can run sequentially or in parallel10jobs:11 prepare-execution-marix:1213 name: Prepare execution matrix1415 runs-on: self-hosted-ci16 outputs:17 matrix: ${{ steps.create_matrix.outputs.matrix }}1819 steps:2021 - name: Clean Workspace22 uses: AutoModality/action-clean@v1.1.02324 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it25 - uses: actions/checkout@v3.1.026 with:27 ref: ${{ github.head_ref }} #Checking out head commit2829 - name: Read .env file30 uses: xom9ikk/dotenv@v23132 - name: Create Execution matrix33 uses: CertainLach/create-matrix-action@v434 id: create_matrix35 with:36 matrix: |37 network {quartz}, wasm_name {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}38 network {unique}, wasm_name {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}39 network {opal}, wasm_name {opal}, mainnet_branch {${{ env.OPAL_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}40 network {sapphire}, wasm_name {quartz}, mainnet_branch {${{ env.SAPPHIRE_MAINNET_BRANCH }}}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}414243 forkless-nodata-build:44 needs: prepare-execution-marix45 # The type of runner that the job will run on46 runs-on: [self-hosted-ci,large]4748 timeout-minutes: 13804950 name: ${{ matrix.network }}-nodata-build5152 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.5354 strategy:55 matrix:56 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}5758 steps:59 - name: Clean Workspace60 uses: AutoModality/action-clean@v1.1.06162 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it63 - uses: actions/checkout@v3.1.064 with:65 ref: ${{ github.head_ref }} #Checking out head commit6667 - name: Read .env file68 uses: xom9ikk/dotenv@v26970 # Prepare SHA 71 - name: Prepare SHA72 uses: ./.github/actions/prepare7374 - name: Log in to Docker Hub75 uses: docker/login-action@v2.1.076 with:77 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}78 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}7980 # Build main image for FORKLESS-UPDATE-NODATA81 - name: Generate ENV related extend Dockerfile file82 uses: cuchi/jinja2-action@v1.2.083 with:84 template: .docker/Dockerfile-parachain-upgrade.j285 output_file: .docker/Dockerfile-parachain-upgrade.${{ matrix.network }}.yml86 variables: |87 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}88 NETWORK=${{ matrix.network }}89 MAINNET_BRANCH=${{ matrix.mainnet_branch }}90 WASM_NAME=${{ matrix.wasm_name }}91 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}92 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}9394 - name: Show build Dockerfile95 run: cat .docker/Dockerfile-parachain-upgrade.${{ matrix.network }}.yml9697 - name: Generate launch-config-forkless-nodata.json98 uses: cuchi/jinja2-action@v1.2.099 with:100 template: .docker/forkless-config/launch-config-forkless-nodata.j2101 output_file: .docker/forkless-config/launch-config-forkless-nodata.json102 variables: |103 WASM_NAME=${{ matrix.wasm_name }}104 RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}105106 - name: Show launch-config-forkless configuration107 run: cat .docker/forkless-config/launch-config-forkless-nodata.json108109 - name: Run find-and-replace to remove slashes from branch name110 uses: mad9000/actions-find-and-replace-string@4111 id: branchname112 with:113 source: ${{ github.head_ref }}114 find: '/'115 replace: '-'116117 - name: Set build SHA118 shell: bash119 run: |120 echo "BUILD_SHA=${LAST_COMMIT_SHA:0:8}" >> $GITHUB_ENV121122 - name: Build the stack123 run: cd .docker/ && docker build --no-cache --file ./Dockerfile-parachain-upgrade.${{ matrix.network }}.yml --tag uniquenetwork/ci-forkless-nodata-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-$BUILD_SHA ../124125 - name: Push docker image version126 run: docker push uniquenetwork/ci-forkless-nodata-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-$BUILD_SHA127128 - name: Remove builder cache129 if: always() # run this step always130 run: |131 docker builder prune -f132 docker system prune -f133134135 forkless-nodata-tests:136 needs: [prepare-execution-marix, forkless-nodata-build]137 # The type of runner that the job will run on138 runs-on: [self-hosted-ci, large]139140 timeout-minutes: 600141142 name: ${{ matrix.network }}-nodata-tests143144 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.145146 strategy:147 matrix:148 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}149150 steps:151 - name: Skip if pull request is in Draft152 if: github.event.pull_request.draft == true153 run: exit 1154155 - name: Clean Workspace156 uses: AutoModality/action-clean@v1.1.0157158 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it159 - uses: actions/checkout@v3.1.0160 with:161 ref: ${{ github.head_ref }} #Checking out head commit162163 - name: Prepare164 uses: ./.github/actions/prepare165166 - name: Set build SHA167 shell: bash168 run: |169 echo "BUILD_SHA=${LAST_COMMIT_SHA:0:8}" >> $GITHUB_ENV170171 - name: Run find-and-replace to remove slashes from branch name172 uses: mad9000/actions-find-and-replace-string@4173 id: branchname174 with:175 source: ${{ github.head_ref }}176 find: '/'177 replace: '-'178179 - name: Read .env file180 uses: xom9ikk/dotenv@v2181182 - name: Generate ENV related extend file for docker-compose183 uses: cuchi/jinja2-action@v1.2.0184 with:185 template: .docker/docker-compose.forkless-nodata.j2186 output_file: .docker/docker-compose.forkless-nodata.${{ matrix.network }}.yml187 variables: |188 NETWORK=${{ matrix.network }}189 BUILD_TAG=${{ steps.branchname.outputs.value }}-$BUILD_SHA190191 - name: Show build configuration192 run: cat .docker/docker-compose.forkless-nodata.${{ matrix.network }}.yml193194 - name: Log in to Docker Hub195 uses: docker/login-action@v2.1.0196 with:197 username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}198 password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}199200 - name: Build the stack201 run: docker-compose -f ".docker/docker-compose.forkless-nodata.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 300202203 - uses: actions/setup-node@v3.5.1204 with:205 node-version: 16206207 - name: Check if docker logs consist logs related to Runtime Upgrade testing.208 if: success()209 run: |210 counter=160211 function check_container_status {212 docker inspect -f {{.State.Running}} forkless-nodata213 }214 function do_docker_logs {215 docker logs --details forkless-nodata 2>&1216 }217 function is_started {218 if [ "$(check_container_status)" == "true" ]; then219 echo "Container: forkless-nodata RUNNING";220 echo "Check Docker logs"221 DOCKER_LOGS=$(do_docker_logs)222 if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then223 echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"224 return 0225 elif [[ ${DOCKER_LOGS} = *"🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"* ]];then226 echo "🚧 PARACHAINS' RUNTIME UPGRADE TESTING FAILED 🚧"227 return 1228 else229 echo "Message not found in logs output, repeating..."230 return 1231 fi232 else233 echo "Container forkless-nodata not RUNNING"234 echo "Halting all future checks"235 exit 1236 fi237 exit 0238 }239 while ! is_started; do240 echo "Waiting for special message in log files "241 sleep 30s242 counter=$(( $counter - 1 ))243 echo "Counter: $counter"244 if [ "$counter" -gt "0" ]; then245 continue246 else247 break248 fi249 done250 echo "Halting script"251 exit 0252 shell: bash253254 - name: Collect Docker Logs255 if: success() || failure()256 uses: jwalton/gh-docker-logs@v2.2.1257 with:258 dest: './forkless-parachain-upgrade-nodata-logs.${{ matrix.network }}'259260 - name: Show docker logs261 if: success() || failure()262 run: cat './forkless-parachain-upgrade-nodata-logs.${{ matrix.network }}/forkless-nodata.log'263264 - name: Run Parallel tests265 working-directory: tests266 run: |267 yarn install268 yarn add mochawesome269 ./scripts/wait_for_first_block.sh270 echo "Ready to start tests"271 yarn polkadot-types272 NOW=$(date +%s) && yarn testParallel --reporter mochawesome --reporter-options reportFilename=test-parallel-${NOW}273 env:274 RPC_URL: http://127.0.0.1:9944/275276 - name: Test Report Parallel277 uses: phoenix-actions/test-reporting@v10278 id: test-report-parallel279 if: success() || failure() # run this step even if previous step failed280 with:281 name: Report Parallel tests results - ${{ matrix.network }} # Name of the check run which will be created282 path: tests/mochawesome-report/test-parallel-*.json # Path to test results283 reporter: mochawesome-json284 fail-on-error: 'false'285286 - name: Run Sequential tests287 working-directory: tests288 if: success() || failure()289 run: |290 yarn install291 yarn add mochawesome292 ./scripts/wait_for_first_block.sh293 echo "Ready to start tests"294 yarn polkadot-types295 NOW=$(date +%s) && yarn testSequential --reporter mochawesome --reporter-options reportFilename=test-sequential-${NOW}296 env:297 RPC_URL: http://127.0.0.1:9944/298299 - name: Test Report Sequential300 uses: phoenix-actions/test-reporting@v10301 id: test-report-sequential302 if: success() || failure() # run this step even if previous step failed303 with:304 name: Report Sequential tests results - ${{ matrix.network }} # Name of the check run which will be created305 path: tests/mochawesome-report/test-sequential-*.json # Path to test results306 reporter: mochawesome-json307 fail-on-error: 'false'308309 - name: Stop running containers310 if: always() # run this step always311 run: docker-compose -f ".docker/docker-compose.forkless-nodata.${{ matrix.network }}.yml" down312313 - name: Remove builder cache314 if: always() # run this step always315 run: |316 docker builder prune -f -a317 docker system prune -f318 docker image prune -f -a.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.ymldiffbeforeafterboth--- a/.github/workflows/xcm.yml
+++ b/.github/workflows/xcm.yml
@@ -473,7 +473,7 @@
yarn polkadot-types
NOW=$(date +%s) && yarn ${{ matrix.runtest }} --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: XCM Test Report
uses: phoenix-actions/test-reporting@v10
.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
}