Skip to content

Commit

Permalink
build(deps): bump jsonrpsee-http-client from 0.13.1 to 0.14.0 (Mysten…
Browse files Browse the repository at this point in the history 
…Labs#2956)

* build(deps): bump jsonrpsee-http-client from 0.13.1 to 0.14.0

Bumps [jsonrpsee-http-client](https://github.com/paritytech/jsonrpsee) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/paritytech/jsonrpsee/releases)
- [Changelog](https://github.com/paritytech/jsonrpsee/blob/master/CHANGELOG.md)
- [Commits](paritytech/jsonrpsee@v0.13.1...v0.14.0)

---
updated-dependencies:
- dependency-name: jsonrpsee-http-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* upgrade jsonrpsee to 0.14.0

* upgrade jsonrpsee to 0.14.0

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: patrick <[email protected]>
  • Loading branch information
@dependabot @patrickkuo
dependabot[bot] and patrickkuo authored Jul 6, 2022
1 parent 2083f73 commit c560158
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 66 deletions.
48 changes: 25 additions & 23 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/sui-json-rpc-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ edition = "2021"
async-trait = "0.1.53"
anyhow = "1.0.58"
schemars = { version = "0.8.10", features = ["either"] }
jsonrpsee = { version = "0.13.1", features = ["full"] }
jsonrpsee-proc-macros = "0.13.1"
jsonrpsee = { version = "0.14.0", features = ["full"] }
jsonrpsee-proc-macros = "0.14.0"
serde = { version = "1.0.138", features = ["derive"] }
serde_json = "1.0.80"
serde_with = { version = "1.14.0", features = ["hex"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-json-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ publish = false
edition = "2021"

[dependencies]
jsonrpsee = { version = "0.13.1", features = ["full"] }
jsonrpsee-core = "0.13.1"
jsonrpsee = { version = "0.14.0", features = ["full"] }
jsonrpsee-core = "0.14.0"
prometheus = "0.13.1"
anyhow = "1.0.58"
tracing = "0.1.34"
Expand Down
27 changes: 11 additions & 16 deletions crates/sui-json-rpc/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,32 +76,27 @@ impl JsonRpcServerBuilder {
use_websocket: bool,
prometheus_registry: &prometheus::Registry,
) -> anyhow::Result<Self> {
let (ac_builder, allow_list) = match env::var("ACCESS_CONTROL_ALLOW_ORIGIN") {
let acl = match env::var("ACCESS_CONTROL_ALLOW_ORIGIN") {
Ok(value) => {
let owned_list: Vec<String> = value
.split(',')
.into_iter()
.map(|s| s.into())
.collect::<Vec<_>>();
(
AccessControlBuilder::default().set_allowed_origins(&owned_list)?,
owned_list,
)
AccessControlBuilder::default().set_allowed_origins(&owned_list)?
}
_ => (AccessControlBuilder::default(), vec![]),
};
_ => AccessControlBuilder::default(),
}
.build();
info!(?acl);

let server_builder = if use_websocket {
let mut builder = WsServerBuilder::default()
.set_middleware(ApiMetrics::WebsocketMetrics(WebsocketMetrics {}));
if !allow_list.is_empty() {
info!("Setting ACCESS_CONTROL_ALLOW_ORIGIN to : {:?}", allow_list);
builder = builder.set_allowed_origins(allow_list)?;
}
ServerBuilder::WsBuilder(builder)
ServerBuilder::WsBuilder(
WsServerBuilder::default()
.set_access_control(acl)
.set_middleware(ApiMetrics::WebsocketMetrics(WebsocketMetrics {})),
)
} else {
let acl = ac_builder.build();
info!(?acl);
ServerBuilder::HttpBuilder(
HttpServerBuilder::default()
.set_access_control(acl)
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tokio = { version = "1.18.2", features = ["full"] }
tracing = "0.1.34"
parking_lot = "0.12.1"
futures = "0.3.21"
jsonrpsee = { version = "0.13.1", features = ["full"] }
jsonrpsee = { version = "0.14.0", features = ["full"] }

sui-config = { path = "../sui-config" }
sui-core = { path = "../sui-core" }
Expand Down
2 changes: 1 addition & 1 deletion crates/sui/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ workspace-hack = { path = "../workspace-hack"}
[dev-dependencies]
tempfile = "3.3.0"
futures = "0.3.21"
jsonrpsee = { version = "0.13.1", features = ["full"] }
jsonrpsee = { version = "0.14.0", features = ["full"] }
typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4"}
test-utils = { path = "../test-utils" }
sui-quorum-driver = { path = "../sui-quorum-driver" }
Expand Down
4 changes: 2 additions & 2 deletions crates/test-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ futures = "0.3.21"
rand = "0.7.3"
tempfile = "3.3.0"
bcs = "0.1.3"
jsonrpsee-http-server = "0.13.1"
jsonrpsee-http-client = "0.13.1"
jsonrpsee-http-server = "0.14.0"
jsonrpsee-http-client = "0.14.0"
prometheus = "0.13.1"

sui = { path = "../sui" }
Expand Down
38 changes: 19 additions & 19 deletions crates/workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ itoa-9fbad63c4bcf4a8f = { package = "itoa", version = "0.4", features = ["std"]
itoa-dff4ba8e3ae991db = { package = "itoa", version = "1", default-features = false }
js-sys = { version = "0.3", default-features = false }
json = { version = "0.12", default-features = false }
jsonrpsee = { version = "0.13", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] }
jsonrpsee-client-transport = { version = "0.13", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] }
jsonrpsee-core = { version = "0.13", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "http-helpers", "hyper", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "wasm-bindgen-futures"] }
jsonrpsee-http-client = { version = "0.13", features = ["hyper-rustls", "tls"] }
jsonrpsee-http-server = { version = "0.13", default-features = false }
jsonrpsee-types = { version = "0.13", default-features = false }
jsonrpsee-wasm-client = { version = "0.13", default-features = false }
jsonrpsee-ws-client = { version = "0.13", features = ["tls"] }
jsonrpsee-ws-server = { version = "0.13", default-features = false }
jsonrpsee = { version = "0.14", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] }
jsonrpsee-client-transport = { version = "0.14", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] }
jsonrpsee-core = { version = "0.14", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "globset", "http-helpers", "hyper", "lazy_static", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "unicase", "wasm-bindgen-futures"] }
jsonrpsee-http-client = { version = "0.14", features = ["hyper-rustls", "tls"] }
jsonrpsee-http-server = { version = "0.14", default-features = false }
jsonrpsee-types = { version = "0.14", default-features = false }
jsonrpsee-wasm-client = { version = "0.14", default-features = false }
jsonrpsee-ws-client = { version = "0.14", features = ["tls"] }
jsonrpsee-ws-server = { version = "0.14", default-features = false }
keccak = { version = "0.1", default-features = false }
kstring = { version = "1", features = ["max_inline", "serde"] }
lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false }
Expand Down Expand Up @@ -792,16 +792,16 @@ itoa-dff4ba8e3ae991db = { package = "itoa", version = "1", default-features = fa
jobserver = { version = "0.1", default-features = false }
js-sys = { version = "0.3", default-features = false }
json = { version = "0.12", default-features = false }
jsonrpsee = { version = "0.13", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] }
jsonrpsee-client-transport = { version = "0.13", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] }
jsonrpsee-core = { version = "0.13", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "http-helpers", "hyper", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "wasm-bindgen-futures"] }
jsonrpsee-http-client = { version = "0.13", features = ["hyper-rustls", "tls"] }
jsonrpsee-http-server = { version = "0.13", default-features = false }
jsonrpsee-proc-macros = { version = "0.13", default-features = false }
jsonrpsee-types = { version = "0.13", default-features = false }
jsonrpsee-wasm-client = { version = "0.13", default-features = false }
jsonrpsee-ws-client = { version = "0.13", features = ["tls"] }
jsonrpsee-ws-server = { version = "0.13", default-features = false }
jsonrpsee = { version = "0.14", default-features = false, features = ["async-client", "client", "client-ws-transport", "full", "http-client", "http-server", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "macros", "server", "tracing", "wasm-client", "ws-client", "ws-server"] }
jsonrpsee-client-transport = { version = "0.14", default-features = false, features = ["anyhow", "futures-channel", "futures-timer", "futures-util", "gloo-net", "http", "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tls", "tokio", "tokio-rustls", "tokio-util", "web", "webpki-roots", "ws"] }
jsonrpsee-core = { version = "0.14", features = ["arrayvec", "async-client", "async-lock", "async-wasm-client", "client", "futures-timer", "futures-util", "globset", "http-helpers", "hyper", "lazy_static", "parking_lot", "rand", "rustc-hash", "server", "soketto", "tokio", "tracing", "unicase", "wasm-bindgen-futures"] }
jsonrpsee-http-client = { version = "0.14", features = ["hyper-rustls", "tls"] }
jsonrpsee-http-server = { version = "0.14", default-features = false }
jsonrpsee-proc-macros = { version = "0.14", default-features = false }
jsonrpsee-types = { version = "0.14", default-features = false }
jsonrpsee-wasm-client = { version = "0.14", default-features = false }
jsonrpsee-ws-client = { version = "0.14", features = ["tls"] }
jsonrpsee-ws-server = { version = "0.14", default-features = false }
keccak = { version = "0.1", default-features = false }
kstring = { version = "1", features = ["max_inline", "serde"] }
lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false }
Expand Down

0 comments on commit c560158

Please sign in to comment.