diff --git a/Cargo.lock b/Cargo.lock index 7ec4a607ae..30ddf5d118 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3506,8 +3506,8 @@ dependencies = [ "futures 0.1.30", "hyper 0.12.35", "hyper-tls 0.3.2", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpc-core 15.1.0", + "jsonrpc-pubsub 15.1.0", "jsonrpc-server-utils", "log 0.4.13", "parity-tokio-ipc 0.2.0", @@ -3531,6 +3531,19 @@ dependencies = [ "serde_json", ] +[[package]] +name = "jsonrpc-core" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f" +dependencies = [ + "futures 0.3.11", + "log 0.4.13", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "jsonrpc-core-client" version = "15.1.0" @@ -3559,7 +3572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" dependencies = [ "hyper 0.12.35", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log 0.4.13", "net2", @@ -3573,7 +3586,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log 0.4.13", "parity-tokio-ipc 0.4.0", @@ -3587,13 +3600,28 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "log 0.4.13", "parking_lot 0.10.2", "rand 0.7.3", "serde", ] +[[package]] +name = "jsonrpc-pubsub" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c48dbebce7a9c88ab272a4db7d6478aa4c6d9596e6c086366e89efc4e9ed89e" +dependencies = [ + "futures 0.3.11", + "jsonrpc-core 17.0.0", + "lazy_static", + "log 0.4.13", + "parking_lot 0.11.1", + "rand 0.7.3", + "serde", +] + [[package]] name = "jsonrpc-server-utils" version = "15.1.0" @@ -3602,7 +3630,7 @@ checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176" dependencies = [ "bytes 0.4.12", "globset", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "lazy_static", "log 0.4.13", "tokio 0.1.22", @@ -3616,7 +3644,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c2645fad19361780217525afe54984046bab2400346395244e6d74f33aa9a0a" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log 0.4.13", "parking_lot 0.10.2", @@ -3629,7 +3657,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log 0.4.13", "parity-ws", @@ -7835,7 +7863,7 @@ dependencies = [ "futures-timer", "hex", "indicatif", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-tcp-server", "libloading 0.6.7", "rand 0.7.3", @@ -8152,10 +8180,10 @@ dependencies = [ "async-trait", "futures 0.3.11", "hex", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-core-client", "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpc-pubsub 17.0.0", "jsonrpc-server-utils", "network-p2p-types", "serde", @@ -8191,10 +8219,10 @@ dependencies = [ "futures 0.3.11", "hex", "jsonrpc-client-transports", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-core-client", "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpc-pubsub 17.0.0", "jsonrpc-server-utils", "log 0.4.13", "network-p2p-types", @@ -8232,7 +8260,7 @@ dependencies = [ "failure", "futures 0.3.11", "futures01", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "once_cell", "rand 0.7.3", "starcoin-logger", @@ -8255,12 +8283,12 @@ dependencies = [ "futures-channel", "governor", "hex", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-http-server", "jsonrpc-ipc-server", - "jsonrpc-pubsub", + "jsonrpc-pubsub 17.0.0", "jsonrpc-server-utils", "jsonrpc-tcp-server", "jsonrpc-ws-server", diff --git a/rpc/api/Cargo.toml b/rpc/api/Cargo.toml index e90c09aadd..df5e24bf90 100644 --- a/rpc/api/Cargo.toml +++ b/rpc/api/Cargo.toml @@ -18,7 +18,7 @@ actix-rt = "1.1" jsonrpc-core = { version = "15.1.0", features = ["arbitrary_precision"] } jsonrpc-derive = "15.1.0" jsonrpc-server-utils = "15.1.0" -jsonrpc-pubsub = "15.1.0" +jsonrpc-pubsub = "17.0.0" jsonrpc-core-client = { version = "15.1.0", features = ["http", "ipc", "ws", "arbitrary_precision"]} futures = { version = "0.3", features = ["compat"] } scs = { package="starcoin-canonical-serialization", path = "../../commons/scs"} diff --git a/rpc/client/Cargo.toml b/rpc/client/Cargo.toml index 1decfc754a..2f978f8032 100644 --- a/rpc/client/Cargo.toml +++ b/rpc/client/Cargo.toml @@ -25,7 +25,7 @@ parking_lot = "0.11.1" jsonrpc-core = { version = "15.1.0", features = ["arbitrary_precision"] } jsonrpc-derive = "15.1.0" jsonrpc-server-utils = "15.1.0" -jsonrpc-pubsub = "15.1.0" +jsonrpc-pubsub = "17.0.0" jsonrpc-core-client = { version = "15.1.0", features = ["http", "ipc", "ws", "arbitrary_precision"]} jsonrpc-client-transports = { version = "15.1.0", features = ["http", "ipc", "ws", "arbitrary_precision"] } futures03 = { package="futures",version = "0.3", features = ["compat"] } diff --git a/rpc/server/Cargo.toml b/rpc/server/Cargo.toml index ebc4db74dc..c3893893eb 100644 --- a/rpc/server/Cargo.toml +++ b/rpc/server/Cargo.toml @@ -26,7 +26,7 @@ jsonrpc-tcp-server = "15.1.0" jsonrpc-ipc-server = "15.1.0" jsonrpc-ws-server = "15.1.0" jsonrpc-server-utils = "15.1.0" -jsonrpc-pubsub = "15.1.0" +jsonrpc-pubsub = "17.0.0" jsonrpc-core-client = { version = "15.1.0", features = ["http", "ipc", "ws", "arbitrary_precision"]} tokio01 = { version="0.1", package="tokio"} futures = { version = "0.3", features = ["compat"] }