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

difftreelog

ci remove ws-port leftovers

Yaroslav Bolyukin2023-07-21parent: #1b4b057.patch.diff
in: master

30 files changed

modified.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
modified.docker/Dockerfile-testnet.j2diffbeforeafterboth
before · .docker/Dockerfile-testnet.j2
1# ===== Rust builder =====2FROM uniquenetwork/services:latest as rust-builder3ARG RUST_TOOLCHAIN=45ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN6ENV CARGO_HOME="/cargo-home"7ENV PATH="/cargo-home/bin:$PATH"8ENV TZ=UTC910RUN rustup toolchain uninstall $(rustup toolchain list) && \11    rustup toolchain install {{ RUST_TOOLCHAIN }} && \12    rustup default {{ RUST_TOOLCHAIN }} && \13    rustup target list --installed && \14    rustup show15RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1617RUN mkdir /unique_parachain18WORKDIR /unique_parachain1920# ===== BUILD ======21FROM rust-builder as builder-unique2223ARG PROFILE=release2425WORKDIR /unique_parachain2627RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \28    cd unique-chain && \29    cargo build --features={{ NETWORK }}-runtime --$PROFILE3031# ===== RUN ======3233FROM ubuntu:22.043435RUN apt-get -y update && \36      apt-get -y install curl git && \37      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \38      export NVM_DIR="$HOME/.nvm" && \39      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \40      nvm install v16.16.0 && \41      nvm use v16.16.04243RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}4445RUN export NVM_DIR="$HOME/.nvm" && \46    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \47    cd /polkadot-launch && \48    npm install --global yarn && \49    yarn install5051COPY --from=builder-unique /unique_parachain/unique-chain/.docker/testnet-config/launch-config.json /polkadot-launch/launch-config.json52COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/5354COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/5556EXPOSE 984457EXPOSE 994458EXPOSE 993359EXPOSE 983360EXPOSE 4033361EXPOSE 303336263CMD export NVM_DIR="$HOME/.nvm" && \64    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \65    cd /polkadot-launch && \66    yarn start launch-config.json
modified.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
modified.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": [
modified.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": [
modified.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": [
modified.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
modified.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
modified.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
modified.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"
modified.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:
modified.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
modified.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
modified.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",
modified.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
modified.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",
modified.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",
modified.docker/xcm-config/launch-config-xcm-opal.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-opal.j2
+++ b/.docker/xcm-config/launch-config-xcm-opal.j2
@@ -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": [
modified.docker/xcm-config/launch-config-xcm-quartz.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -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": [
modified.docker/xcm-config/launch-config-xcm-unique.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -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": [
modified.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
modified.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
modified.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: |
modified.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
modified.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
modified.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
modified.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) }}
modified.gitignorediffbeforeafterboth
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,6 @@
 cumulus-parachain/
 *genesis
 *wasm
-tmp/
\ No newline at end of file
+tmp/
+
+*.log
modifiedlaunch-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", ]
modifiedtests/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
 }