From 9bcb589785c726a340dc169b2f60ad8edc8e2ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Fri, 2 Mar 2018 10:26:49 +0100 Subject: [PATCH] Support parity protocol. (#8035) --- parity/cli/mod.rs | 2 +- parity/configuration.rs | 2 +- parity/rpc.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 88088414f..c41b59598 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -478,7 +478,7 @@ usage! { "--ws-apis=[APIS]", "Specify the APIs available through the WebSockets interface. APIS is a comma-delimited list of API name. Possible name are web3, eth, pubsub, net, personal, parity, parity_set, traces, rpc, parity_accounts, pubsub, parity_pubsub, shh, shh_pubsub, signer, secretstore.", - ARG arg_ws_origins: (String) = "chrome-extension://*,moz-extension://*", or |c: &Config| c.websockets.as_ref()?.origins.as_ref().map(|vec| vec.join(",")), + ARG arg_ws_origins: (String) = "parity://*,chrome-extension://*,moz-extension://*", or |c: &Config| c.websockets.as_ref()?.origins.as_ref().map(|vec| vec.join(",")), "--ws-origins=[URL]", "Specify Origin header values allowed to connect. Special options: \"all\", \"none\".", diff --git a/parity/configuration.rs b/parity/configuration.rs index 480fefe7d..9632ce935 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -1335,7 +1335,7 @@ mod tests { interface: "127.0.0.1".into(), port: 8546, apis: ApiSet::UnsafeContext, - origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]), + origins: Some(vec!["parity://*".into(),"chrome-extension://*".into(), "moz-extension://*".into()]), hosts: Some(vec![]), signer_path: expected.into(), ui_address: Some("127.0.0.1:8180".into()), diff --git a/parity/rpc.rs b/parity/rpc.rs index 1f7cd2af2..7bda20f72 100644 --- a/parity/rpc.rs +++ b/parity/rpc.rs @@ -162,7 +162,7 @@ impl Default for WsConfiguration { interface: "127.0.0.1".into(), port: 8546, apis: ApiSet::UnsafeContext, - origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]), + origins: Some(vec!["parity://*".into(),"chrome-extension://*".into(), "moz-extension://*".into()]), hosts: Some(Vec::new()), signer_path: replace_home(&data_dir, "$BASE/signer").into(), support_token_api: true,