diff --git a/core-client/Cargo.toml b/core-client/Cargo.toml index d21f13b94..7bf00a1aa 100644 --- a/core-client/Cargo.toml +++ b/core-client/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"] license = "MIT" name = "jsonrpc-core-client" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" categories = [ "asynchronous", @@ -26,7 +26,7 @@ ipc = ["jsonrpc-client-transports/ipc", "futures01"] arbitrary_precision = ["jsonrpc-client-transports/arbitrary_precision"] [dependencies] -jsonrpc-client-transports = { version = "15.0", path = "./transports", default-features = false } +jsonrpc-client-transports = { version = "16.0", path = "./transports", default-features = false } # Only for client transports, should be removed when we fully transition to futures=0.3 futures01 = { version = "0.1", package = "futures", optional = true } futures = { version = "0.3", features = [ "compat" ] } diff --git a/core-client/transports/Cargo.toml b/core-client/transports/Cargo.toml index 73a311bcb..a1804b8c1 100644 --- a/core-client/transports/Cargo.toml +++ b/core-client/transports/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"] license = "MIT" name = "jsonrpc-client-transports" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" categories = [ "asynchronous", @@ -38,8 +38,8 @@ arbitrary_precision = ["serde_json/arbitrary_precision", "jsonrpc-core/arbitrary [dependencies] derive_more = "0.99" futures = { version = "0.3", features = [ "compat" ] } -jsonrpc-core = { version = "15.0", path = "../../core" } -jsonrpc-pubsub = { version = "15.0", path = "../../pubsub" } +jsonrpc-core = { version = "16.0", path = "../../core" } +jsonrpc-pubsub = { version = "16.0", path = "../../pubsub" } log = "0.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" @@ -48,15 +48,15 @@ url = "1.7" futures01 = { version = "0.1.26", package = "futures", optional = true } hyper = { version = "0.12", optional = true } hyper-tls = { version = "0.3.2", optional = true } -jsonrpc-server-utils = { version = "15.0", path = "../../server-utils", optional = true } +jsonrpc-server-utils = { version = "16.0", path = "../../server-utils", optional = true } parity-tokio-ipc = { version = "0.2", optional = true } tokio = { version = "0.1", optional = true } websocket = { version = "0.24", optional = true } [dev-dependencies] assert_matches = "1.1" -jsonrpc-http-server = { version = "15.0", path = "../../http" } -jsonrpc-ipc-server = { version = "15.0", path = "../../ipc" } +jsonrpc-http-server = { version = "16.0", path = "../../http" } +jsonrpc-ipc-server = { version = "16.0", path = "../../ipc" } lazy_static = "1.0" env_logger = "0.7" diff --git a/core/Cargo.toml b/core/Cargo.toml index c975839bb..22fac8938 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"] license = "MIT" name = "jsonrpc-core" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" categories = [ "asynchronous", diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 4e399764a..5d586c0a6 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://github.com/paritytech/jsonrpc" license = "MIT" name = "jsonrpc-derive" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [lib] proc-macro = true @@ -20,10 +20,10 @@ proc-macro-crate = "0.1.4" [dev-dependencies] assert_matches = "1.3" -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-core-client = { version = "15.0", path = "../core-client" } -jsonrpc-pubsub = { version = "15.0", path = "../pubsub" } -jsonrpc-tcp-server = { version = "15.0", path = "../tcp" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-core-client = { version = "16.0", path = "../core-client" } +jsonrpc-pubsub = { version = "16.0", path = "../pubsub" } +jsonrpc-tcp-server = { version = "16.0", path = "../tcp" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" trybuild = "1.0" diff --git a/http/Cargo.toml b/http/Cargo.toml index f881710e0..864c3e8b3 100644 --- a/http/Cargo.toml +++ b/http/Cargo.toml @@ -8,14 +8,14 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "server"] license = "MIT" name = "jsonrpc-http-server" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures01 = { version = "0.1", package = "futures" } futures03 = { version = "0.3", package = "futures", features = ["compat"] } hyper = "0.12" -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-server-utils = { version = "15.0", path = "../server-utils" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-server-utils = { version = "16.0", path = "../server-utils" } log = "0.4" net2 = "0.2" parking_lot = "0.10.0" diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml index fa4783dd8..3bc1cb1fb 100644 --- a/ipc/Cargo.toml +++ b/ipc/Cargo.toml @@ -7,15 +7,15 @@ homepage = "https://github.com/paritytech/jsonrpc" license = "MIT" name = "jsonrpc-ipc-server" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures01 = { version = "0.1", package = "futures" } futures03 = { version = "0.3", package = "futures", features = [ "compat" ] } log = "0.4" tokio-service = "0.1" -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-server-utils = { version = "15.0", path = "../server-utils" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-server-utils = { version = "16.0", path = "../server-utils" } parity-tokio-ipc = "0.4" parking_lot = "0.10.0" diff --git a/pubsub/Cargo.toml b/pubsub/Cargo.toml index 6a6301400..0386764f1 100644 --- a/pubsub/Cargo.toml +++ b/pubsub/Cargo.toml @@ -8,11 +8,11 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "macros"] license = "MIT" name = "jsonrpc-pubsub" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures = { version = "0.3", features = ["thread-pool"] } -jsonrpc-core = { version = "15.0", path = "../core" } +jsonrpc-core = { version = "16.0", path = "../core" } lazy_static = "1.4" log = "0.4" parking_lot = "0.11.0" @@ -20,7 +20,7 @@ rand = "0.7" serde = "1.0" [dev-dependencies] -jsonrpc-tcp-server = { version = "15.0", path = "../tcp" } +jsonrpc-tcp-server = { version = "16.0", path = "../tcp" } [badges] travis-ci = { repository = "paritytech/jsonrpc", branch = "master"} diff --git a/pubsub/more-examples/Cargo.toml b/pubsub/more-examples/Cargo.toml index e7e479a80..ea99adc26 100644 --- a/pubsub/more-examples/Cargo.toml +++ b/pubsub/more-examples/Cargo.toml @@ -3,12 +3,12 @@ name = "jsonrpc-pubsub-examples" description = "Examples of Publish-Subscribe extension for jsonrpc." homepage = "https://github.com/paritytech/jsonrpc" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" authors = ["tomusdrw "] license = "MIT" [dependencies] -jsonrpc-core = { version = "15.0", path = "../../core" } -jsonrpc-pubsub = { version = "15.0", path = "../" } -jsonrpc-ws-server = { version = "15.0", path = "../../ws" } -jsonrpc-ipc-server = { version = "15.0", path = "../../ipc" } +jsonrpc-core = { version = "16.0", path = "../../core" } +jsonrpc-pubsub = { version = "16.0", path = "../" } +jsonrpc-ws-server = { version = "16.0", path = "../../ws" } +jsonrpc-ipc-server = { version = "16.0", path = "../../ipc" } diff --git a/server-utils/Cargo.toml b/server-utils/Cargo.toml index c21a0eca7..4324500ab 100644 --- a/server-utils/Cargo.toml +++ b/server-utils/Cargo.toml @@ -8,13 +8,13 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"] license = "MIT" name = "jsonrpc-server-utils" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] bytes = "0.4" futures01 = { version = "0.1", package = "futures" } globset = "0.4" -jsonrpc-core = { version = "15.0", path = "../core" } +jsonrpc-core = { version = "16.0", path = "../core" } lazy_static = "1.1.0" log = "0.4" tokio = { version = "0.1.15" } diff --git a/stdio/Cargo.toml b/stdio/Cargo.toml index 96241bc4f..ef90c2093 100644 --- a/stdio/Cargo.toml +++ b/stdio/Cargo.toml @@ -7,11 +7,11 @@ homepage = "https://github.com/paritytech/jsonrpc" license = "MIT" name = "jsonrpc-stdio-server" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures = { version = "0.3", features = [ "compat" ] } -jsonrpc-core = { version = "15.0", path = "../core" } +jsonrpc-core = { version = "16.0", path = "../core" } log = "0.4" tokio = "0.1.7" tokio-codec = "0.1.0" diff --git a/tcp/Cargo.toml b/tcp/Cargo.toml index 7f41efcff..d3b8e9eb7 100644 --- a/tcp/Cargo.toml +++ b/tcp/Cargo.toml @@ -7,14 +7,14 @@ homepage = "https://github.com/paritytech/jsonrpc" license = "MIT" name = "jsonrpc-tcp-server" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures01 = { version = "0.1", package = "futures" } # TODO remove when we no longer need compat (use jsonrpc-core re-export instead) futures03 = { version = "0.3", features = ["compat"], package = "futures" } -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-server-utils = { version = "15.0", path = "../server-utils" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-server-utils = { version = "16.0", path = "../server-utils" } log = "0.4" parking_lot = "0.10.0" tokio-service = "0.1" diff --git a/test/Cargo.toml b/test/Cargo.toml index 7436abb28..a9cfd280b 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jsonrpc-test" description = "Simple test framework for JSON-RPC." -version = "15.0.0" +version = "16.0.0" authors = ["Tomasz Drwięga "] license = "MIT" homepage = "https://github.com/paritytech/jsonrpc" @@ -10,9 +10,9 @@ documentation = "https://docs.rs/jsonrpc-test/" edition = "2018" [dependencies] -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-core-client = { version = "15.0", path = "../core-client" } -jsonrpc-pubsub = { version = "15.0", path = "../pubsub" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-core-client = { version = "16.0", path = "../core-client" } +jsonrpc-pubsub = { version = "16.0", path = "../pubsub" } log = "0.4" serde = "1.0" serde_json = "1.0" @@ -21,5 +21,5 @@ serde_json = "1.0" arbitrary_precision = ["jsonrpc-core-client/arbitrary_precision", "serde_json/arbitrary_precision", "jsonrpc-core/arbitrary_precision"] [dev-dependencies] -jsonrpc-derive = { version = "15.0", path = "../derive" } +jsonrpc-derive = { version = "16.0", path = "../derive" } diff --git a/ws/Cargo.toml b/ws/Cargo.toml index deabf5854..81d4eb34e 100644 --- a/ws/Cargo.toml +++ b/ws/Cargo.toml @@ -7,17 +7,17 @@ homepage = "https://github.com/paritytech/jsonrpc" license = "MIT" name = "jsonrpc-ws-server" repository = "https://github.com/paritytech/jsonrpc" -version = "15.0.0" +version = "16.0.0" [dependencies] futures01 = { version = "0.1", package = "futures" } futures03 = { version = "0.3", package = "futures", features = [ "compat" ] } -jsonrpc-core = { version = "15.0", path = "../core" } -jsonrpc-server-utils = { version = "15.0", path = "../server-utils" } +jsonrpc-core = { version = "16.0", path = "../core" } +jsonrpc-server-utils = { version = "16.0", path = "../server-utils" } log = "0.4" parking_lot = "0.10.0" slab = "0.4" -ws = "0.9" +parity-ws = "0.10" [badges] travis-ci = { repository = "paritytech/jsonrpc", branch = "master"} diff --git a/ws/src/lib.rs b/ws/src/lib.rs index aeae08a5d..5c1cfc3ca 100644 --- a/ws/src/lib.rs +++ b/ws/src/lib.rs @@ -5,7 +5,7 @@ use jsonrpc_server_utils as server_utils; pub use jsonrpc_core; -pub use ws; +pub use parity_ws as ws; #[macro_use] extern crate log; diff --git a/ws/src/server.rs b/ws/src/server.rs index ca758e580..3e51ef208 100644 --- a/ws/src/server.rs +++ b/ws/src/server.rs @@ -68,6 +68,8 @@ impl Server { config.max_connections = max_connections; // don't accept super large requests config.max_fragment_size = max_payload_bytes; + config.max_in_buffer_capacity = max_payload_bytes; + config.max_out_buffer_capacity = max_payload_bytes; // don't grow non-final fragments (to prevent DOS) config.fragments_grow = false; config.fragments_capacity = cmp::max(1, max_payload_bytes / config.fragment_size);