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.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.shdiffbeforeafterboth1#!/usr/bin/env bash23set -eu45DIR=realpathdirname"$0"6TEMPLATE=$DIR/types_template7GIT_REPO=git@github.com:UniqueNetwork/unique-types-js.git89. $DIR/functions.sh1011usage() {12 echo "Usage: [RPC_URL=http://localhost:9944] $0 <--rc|--release> [--force] [--push] [--rpc-url=http://localhost:9944]" 1>&213 exit 114}1516rc=17release=18force=19push=2021for i in "$@"; do22case $i in23 --rc)24 rc=125 if test "$release"; then usage; fi26 ;;27 --release)28 release=129 if test "$rc"; then usage; fi30 ;;31 --force)32 force=133 ;;34 --push)35 push=136 ;;37 --rpc-url=*)38 RPC_URL=i39 ;;40 *)41 usage42 ;;43esac44done4546if test \( ! \( "$rc" -o "$release" \) \) -o \( "RPC_URL" = "" \); then47 usage48elif test "$rc"; then49 echo "Rc build"50else51 echo "Release build"52fi5354cd $DIR/..55yarn polkadot-types5657version=do_rpc""58spec_version=echo$version|jq-r59spec_name=echo$version|jq-r60echo "Spec version: $spec_version, name: $spec_name"6162case $spec_name in63 opal)64 package_name=@unique-nft/opal-testnet-types65 repo_branch=opal-testnet66 repo_tag=$repo_branch67 ;;68 sapphire)69 package_name=@unique-nft/sapphire-mainnet-types70 repo_branch=sapphire-mainnet71 repo_tag=$repo_branch72 ;;73 quartz)74 package_name=@unique-nft/quartz-mainnet-types75 repo_branch=quartz-mainnet76 repo_tag=$repo_branch77 ;;78 unique)79 package_name=@unique-nft/unique-mainnet-types80 repo_branch=master81 repo_tag=unique-mainnet82 ;;83 *)84 echo "unknown spec name: $spec_name"85 exit 186 ;;87esac8889if test "$rc" = 1; then90 if "$spec_name" != opal; then91 echo "rc types can only be based on opal spec"92 exit 193 fi94 package_name=@unique-nft/rc-types95 repo_branch=rc96 repo_tag=$repo_branch97fi9899package_version=spec_version.echospec_version|sed's/^0*//'.100last_patch=NEVER101for tag in git-t--refs$GIT_REPO|cut-f|sort-r; do102 tag_prefix=refs/tags/$repo_tag-v$package_version103 if [[ $tag == $tag_prefix* ]]; then104 last_patch=tag105 break;106 fi107done108echo "Package version: package_versionX, name: $package_name"109echo "Last published: $package_version$last_patch"110111if test "$last_patch" = "NEVER"; then112 new_package_version=package_version0113else114 new_package_version=package_version$((last_patch+1))115fi116package_version=package_version$last_patch117echo "New package version: $new_package_version"118119pjsapi_ver=^cat$DIR|jq-r'.dependencies."@polkadot/api"'|sed-e"s/^\^//"120tsnode_ver=^cat$DIR|jq-r'.devDependencies."ts-node"'|sed-e"s/^\^//"121ts_ver=^cat$DIR|jq-r'.devDependencies."typescript"'|sed-e"s/^\^//"122123gen=mktemp-d124pushd $gen125git clone $GIT_REPO -b $repo_branch --depth 1 .126if test "$last_patch" != "NEVER"; then127 git reset --hard $repo_tag-v$package_version128fi129git rm -r "*"130popd131132# Using old package_version here, becaue we first check if133# there is any difference between generated and already uplaoded types134cat $TEMPLATE/package.json \135| jq '.private = false' - \136| jq '.name = "'$package_name'"' - \137| jq '.version = "'$package_version'"' - \138| jq '.peerDependencies."@polkadot/api" = "'$pjsapi_ver'"' - \139| jq '.peerDependencies."@polkadot/types" = "'$pjsapi_ver'"' - \140| jq '.devDependencies."@polkadot/api" = "'$pjsapi_ver'"' - \141| jq '.devDependencies."@polkadot/types" = "'$pjsapi_ver'"' - \142| jq '.devDependencies."ts-node" = "'$tsnode_ver'"' - \143| jq '.devDependencies."typescript" = "'$ts_ver'"' - \144> $gen/package.json145for file in .gitignore .npmignore README.md tsconfig.json; do146 cp $TEMPLATE/$file $gen/147done148package_name_replacement=printf'%s\n'"$package_name"|sed-e's/[\/&]/\\&/g'149sed -i 's/PKGNAME/'$package_name_replacement'/' $gen/README.md150151rsync -ar --exclude .gitignore src/interfaces/ $gen152for file in $gen/augment-* $gen/**/types.ts $gen/registry.ts; do153 sed -i '1s;^;//@ts-nocheck\n;' $file154done155156pushd $gen157git add .158popd159160pushd $gen161if git diff --quiet HEAD && test ! "$force"; then162 echo "no changes detected"163 exit 0164fi165popd166167mv $gen/package.json $gen/package.old.json168cat $gen/package.old.json \169| jq '.version = "'$new_package_version'"' - \170> $gen/package.json171rm $gen/package.old.json172pushd $gen173git add package.json174popd175176echo "package.json contents:"177cat $gen/package.json178echo "overall diff:"179pushd $gen180git status181git diff HEAD || true182popd183184# This check is only active if running in interactive terminal185if [ -t 0 ]; then186 read -p "Is everything ok at $gen [y/n]? " -n 1 -r187 echo188 if [[ ! $REPLY =~ ^[Yy]$ ]]; then189 echo "Aborting!"190 exit 1191 fi192fi193194pushd $gen195yarn196yarn prepublish197git commit -m "chore: upgrade types to v$new_package_version"198git tag --force $repo_tag-v$new_package_version199if test "$push" = 1; then200 git push --tags --force -u origin HEAD201else202 echo "--push not given, origin repo left intact"203 echo "To publish manually, go to $gen, and run \"git push --tags --force -u origin HEAD\""204fi205popd