diff --git a/js/src/embed.js b/js/src/embed.js index 5e8bf7ffe..0413fb466 100644 --- a/js/src/embed.js +++ b/js/src/embed.js @@ -64,14 +64,19 @@ class FakeTransport { class FrameSecureApi extends SecureApi { constructor (transport) { - super(transport.uiUrl, null, () => { - return transport; - }); + super( + transport.uiUrl, + null, + () => transport, + () => 'http:' + ); } connect () { // Do nothing - this API does not need connecting this.emit('connecting'); + // Fetch settings + this._fetchSettings(); // Fire connected event with some delay. setTimeout(() => { this.emit('connected'); diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index b978918ce..852319381 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -195,7 +195,7 @@ usage! { or |c: &Config| otry!(c.websockets).interface.clone(), flag_ws_apis: String = "web3,eth,pubsub,net,parity,parity_pubsub,traces,rpc,secretstore,shh,shh_pubsub", or |c: &Config| otry!(c.websockets).apis.as_ref().map(|vec| vec.join(",")), - flag_ws_origins: String = "chrome-extension://*", + flag_ws_origins: String = "chrome-extension://*,moz-extension://*", or |c: &Config| otry!(c.websockets).origins.as_ref().map(|vec| vec.join(",")), flag_ws_hosts: String = "none", or |c: &Config| otry!(c.websockets).hosts.as_ref().map(|vec| vec.join(",")), diff --git a/parity/configuration.rs b/parity/configuration.rs index fda91e231..1fb4e00c6 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -1301,7 +1301,7 @@ mod tests { interface: "127.0.0.1".into(), port: 8546, apis: ApiSet::UnsafeContext, - origins: Some(vec!["chrome-extension://*".into()]), + origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]), hosts: Some(vec![]), signer_path: expected.into(), ui_address: Some(("127.0.0.1".to_owned(), 8180)), diff --git a/parity/rpc.rs b/parity/rpc.rs index 9173e7b2f..2c80cddc5 100644 --- a/parity/rpc.rs +++ b/parity/rpc.rs @@ -163,7 +163,7 @@ impl Default for WsConfiguration { interface: "127.0.0.1".into(), port: 8546, apis: ApiSet::UnsafeContext, - origins: Some(vec!["chrome-extension://*".into()]), + origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]), hosts: Some(Vec::new()), signer_path: replace_home(&data_dir, "$BASE/signer").into(), support_token_api: true,