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.ymldiffbeforeafterboth1# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586509375/Market+e2e+test2# Nested workflow for lunching Market e2e tests from external repository https://github.com/UniqueNetwork/market-e2e-tests34name: market api tests56# Controls when the action will run.7on:8 workflow_call:91011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:1314 prepare-execution-marix:1516 name: Prepare execution matrix1718 runs-on: [self-hosted-ci]19 outputs:20 matrix: ${{ steps.create_matrix.outputs.matrix }}2122 steps:2324 - name: Clean Workspace25 uses: AutoModality/action-clean@v1.1.02627 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it28 - uses: actions/checkout@v3.1.029 with:30 ref: ${{ github.head_ref }} #Checking out head commit3132 - name: Read .env file33 uses: xom9ikk/dotenv@v23435 - name: Create Execution matrix36 uses: CertainLach/create-matrix-action@v437 id: create_matrix38 with:39 matrix: |40 network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}414243 market_test:44 needs: prepare-execution-marix45 # The type of runner that the job will run on46 runs-on: [self-hosted-ci,large]47 timeout-minutes: 3604849 name: ${{ matrix.network }} 5051 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.52 53 strategy:54 matrix:55 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}5657 steps:58 - name: Clean Workspace59 uses: AutoModality/action-clean@v1.1.06061 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it62 - name: Checkout master repo63 uses: actions/checkout@master64 with:65 ref: ${{ github.head_ref }} #Checking out head commit6667 - name: Checkout Market e2e tests68 uses: actions/checkout@v3.1.069 with:70 repository: 'UniqueNetwork/market-e2e-tests'71 ssh-key: ${{ secrets.GH_PAT }}72 path: 'qa-tests'73 ref: 'master'7475 - name: Read .env file76 uses: xom9ikk/dotenv@v277 78 - name: Copy qa-tests/.env.example to qa-tests/.env79 working-directory: qa-tests80 run: cp .env.docker .env81 82 - name: Generate ENV related extend file for docker-compose83 uses: cuchi/jinja2-action@v1.2.084 with:85 template: qa-tests/.docker/docker-compose.tmp-market.j286 output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml87 variables: |88 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git89 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}90 POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}91 POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}92 NETWORK=${{ matrix.network }}93 BRANCH=${{ github.head_ref }}949596 - name: Show build configuration97 working-directory: qa-tests98 run: cat .docker/docker-compose.${{ matrix.network }}.yml99100 - name: Start node-parachain101 working-directory: qa-tests102 run: docker-compose -f ".docker/docker-compose.market.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate node-parachain 103 104 - uses: actions/setup-node@v3.5.1105 with:106 node-version: 16.17107108 - name: Setup TypeScript109 working-directory: qa-tests110 run: |111 npm install -g ts-node112 npm install113114 - name: Copy qa-tests/.env.docker to qa-tests/.env115 working-directory: qa-tests116 run: | 117 rm -rf .env118 cp .env.docker .env119120# Temporary disable node readyness check. Have to dig into the script logic.121# - name: Wait for chain up and running122# working-directory: tests123# run: |124# yarn install125# ./scripts/wait_for_first_block.sh126# echo "Ready to start tests"127# env:128# RPC_URL: http://127.0.0.1:9933/129130 - name: Wait for chain up and running131 run: |132 sleep 1200s133 echo "Ready to start Market e2e tests"134135 - name: Show content of .env file and Generate accounts136 working-directory: qa-tests137 run: |138 cat .env139 ts-node ./src/scripts/create-market-accounts.ts140141 - name: Copy qa-tests/.env to qa-tests/.env.docker142 working-directory: qa-tests143 run: | 144 rm -rf .env.docker145 cp .env .env.docker146147 - name: Get chain logs148 if: always() # run this step always149 run: |150 docker exec node-parachain cat /polkadot-launch/9944.log151 docker exec node-parachain cat /polkadot-launch/9945.log152 docker exec node-parachain cat /polkadot-launch/alice.log153 docker exec node-parachain cat /polkadot-launch/eve.log154 docker exec node-parachain cat /polkadot-launch/dave.log155 docker exec node-parachain cat /polkadot-launch/charlie.log156 157 - name: Deploy contracts158 run: |159 cd qa-tests160 ts-node ./src/scripts/deploy-contract.ts161162 - name: Timeout for debug163 if: failure()164 run: sleep 300s165166 - name: Import test data167 working-directory: qa-tests168 run: ts-node ./src/scripts/create-test-collections.ts169170 - name: Show content of qa-test .env171 working-directory: qa-tests172 run: cat .env173174 - name: Read qa -test .env file Before market start175 uses: xom9ikk/dotenv@v2176 with:177 path: qa-tests/178179 - name: local-market:start180 run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" up -d --build181182 - name: Wait for market readyness183 working-directory: qa-tests184 run: src/scripts/wait-market-ready.sh185 shell: bash186187 - name: Install dependecies188 working-directory: qa-tests189 run: |190 npm ci191 npm install -D @playwright/test192 npx playwright install-deps193 npx playwright install194195 - name: Show content of qa-test .env196 working-directory: qa-tests197 run: cat .env198 199 - name: Test API interface200 working-directory: qa-tests201 run: |202 npx playwright test --workers=3 --quiet .*.api.test.ts --reporter=github --config playwright.config.ts203204 - name: Timeout for debug205 if: failure()206 run: sleep 300s207208 - name: Stop running containers209 if: always() # run this step always210 run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes211212 - name: Remove builder cache213 if: always() # run this step always214 run: |215 docker builder prune -f216 docker system prune -f.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
}