Start WebSockets server.

demo/cli/src/lib.rs

@@ -129,13 +129,16 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	};
 	let client = Arc::new(client::new_in_mem(executor, prepare_genesis)?);
 
-	let address = "127.0.0.1:9933".parse().unwrap();
-	let handler = rpc::rpc_handler(client, DummyPool);
-	let server = rpc::start_http(&address, handler)?;
+	let handler = rpc::rpc_handler(client, client, DummyPool);
+	let http_address = "127.0.0.1:9933".parse().unwrap();
+	let http_server = rpc::start_http(&http_address, handler)?;
+	let ws_address = "127.0.0.1:9944".parse().unwrap();
+	let ws_server = rpc::start_ws(&ws_address, handler)?;
 
 	if let Some(_) = matches.subcommand_matches("validator") {
 		info!("Starting validator.");
-		server.wait();
+		http_server.wait();
+		ws_server.wait();
 		return Ok(());
 	}
 

polkadot/cli/src/cli.yml

@@ -1,4 +1,4 @@
-name: polkadot
+# name: polkadot
 author: "Parity Team <[email protected]>"
 about: Polkadot Node Rust Implementation
 args:
@@ -40,7 +40,12 @@ args:
   - rpc-port:
       long: rpc-port
       value_name: PORT
-      help: Specify RPC server TCP port
+      help: Specify HTTP RPC server TCP port
+      takes_value: true
+  - ws-port:
+      long: ws-port
+      value_name: PORT
+      help: Specify WebSockets RPC server TCP port
       takes_value: true
   - bootnodes:
       long: bootnodes

polkadot/cli/src/lib.rs

@@ -117,32 +117,36 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	});
 
 	config.roles = role;
-	config.network.boot_nodes = matches
-		.values_of("bootnodes")
-		.map_or(Default::default(), |v| v.map(|n| n.to_owned()).collect());
-	config.network.config_path = Some(network_path(&base_path).to_string_lossy().into());
-	config.network.net_config_path = config.network.config_path.clone();
-
-	let port = match matches.value_of("port") {
-		Some(port) => port.parse().expect("Invalid p2p port value specified."),
-		None => 30333,
-	};
-	config.network.listen_address = Some(SocketAddr::new("0.0.0.0".parse().unwrap(), port));
-	config.network.public_address = None;
-	config.network.client_version = format!("parity-polkadot/{}", crate_version!());
+	{
+		config.network.boot_nodes = matches
+			.values_of("bootnodes")
+			.map_or(Default::default(), |v| v.map(|n| n.to_owned()).collect());
+		config.network.config_path = Some(network_path(&base_path).to_string_lossy().into());
+		config.network.net_config_path = config.network.config_path.clone();
+
+		let port = match matches.value_of("port") {
+			Some(port) => port.parse().expect("Invalid p2p port value specified."),
+			None => 30333,
+		};
+		config.network.listen_address = Some(SocketAddr::new("0.0.0.0".parse().unwrap(), port));
+		config.network.public_address = None;
+		config.network.client_version = format!("parity-polkadot/{}", crate_version!());
+	}
 
 	config.keys = matches.values_of("key").unwrap_or_default().map(str::to_owned).collect();
 
 	let service = service::Service::new(config)?;
 
-	let mut address: SocketAddr = "127.0.0.1:9933".parse().unwrap();
-	if let Some(port) = matches.value_of("rpc-port") {
-		let rpc_port: u16 = port.parse().expect("Invalid RPC port value specified.");
-		address.set_port(rpc_port);
-	}
+	let _rpc_servers = {
+		let http_address = parse_address("127.0.0.1:9933", "rpc-port", &matches);
+		let ws_address = parse_address("127.0.0.1:9944", "ws-port", &matches);
 
-	let handler = rpc::rpc_handler(service.client(), service.transaction_pool());
-	let _server = rpc::start_http(&address, handler)?;
+		let handler = || rpc::rpc_handler(service.client(), service.client(), service.transaction_pool());
+		(
+			rpc::start_http(&http_address, handler())?,
+			rpc::start_ws(&ws_address, handler())?,
+		)
+	};
 
 	informant::start(&service, core.handle());
 
@@ -154,6 +158,16 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 	Ok(())
 }
 
+fn parse_address(default: &str, port_param: &str, matches: &clap::ArgMatches) -> SocketAddr {
+	let mut address: SocketAddr = default.parse().unwrap();
+	if let Some(port) = matches.value_of(port_param) {
+		let port: u16 = port.parse().expect(&format!("Invalid RPC port for --{} specified.", port_param));
+		address.set_port(port);
+	}
+
+	address
+}
+
 fn keystore_path(base_path: &Path) -> PathBuf {
 	let mut path = base_path.to_owned();
 	path.push("keystore");

substrate/rpc-servers/Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git" }
+log = "0.3"
 substrate-rpc = { path = "../rpc", version = "0.1" }
-jsonrpc-core = { git="https://github.com/paritytech/jsonrpc.git" }
-jsonrpc-http-server = { git="https://github.com/paritytech/jsonrpc.git" }