diff --git a/Cargo.lock b/Cargo.lock index cad4c633..fd039519 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2176,7 +2176,7 @@ source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9. dependencies = [ "async-recursion", "futures", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "serde", @@ -2530,7 +2530,7 @@ dependencies = [ "gafi-support", "game3-runtime", "hex-literal", - "jsonrpsee", + "jsonrpsee 0.20.0", "pallet-transaction-payment", "pallet-transaction-payment-rpc", "sc-basic-authorship", @@ -3244,15 +3244,26 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.16.2", "jsonrpsee-http-client", "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-server 0.16.2", + "jsonrpsee-types 0.16.2", "jsonrpsee-ws-client", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8002beb64691edce321fc16cdba91916b10d798f9d480a05467b0ee98463c03b" +dependencies = [ + "jsonrpsee-core 0.20.0", + "jsonrpsee-server 0.20.0", + "jsonrpsee-types 0.20.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.16.2" @@ -3261,8 +3272,8 @@ checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "pin-project", "rustls-native-certs", "soketto", @@ -3290,7 +3301,30 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.16.2", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4278372ecb78ebb522c36a242209a29162f4af0997a41158c8b60450b081baf1" +dependencies = [ + "anyhow", + "async-trait", + "beef", + "futures-util", + "hyper", + "jsonrpsee-types 0.20.0", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3311,8 +3345,8 @@ dependencies = [ "async-trait", "hyper", "hyper-rustls", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "rustc-hash", "serde", "serde_json", @@ -3344,11 +3378,34 @@ dependencies = [ "futures-util", "http", "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", + "serde", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc6357836b1d7b1367fe6d9a9b8d6e5488d1f1db985dfca4cb4ceaa9f37679e" +dependencies = [ + "futures-util", + "http", + "hyper", + "jsonrpsee-core 0.20.0", + "jsonrpsee-types 0.20.0", + "route-recognizer", "serde", "serde_json", "soketto", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -3370,6 +3427,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbea61f2d95b9592491228db0c4d2b1e43ea1154ed9713bb666169cf3919ea7d" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.16.2" @@ -3378,8 +3449,8 @@ checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", ] [[package]] @@ -4943,7 +5014,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9.42#b0de7e79a3cfba77a9e380f4be00fa98c23d498c" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -5893,6 +5964,12 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.2.0" @@ -6445,7 +6522,7 @@ dependencies = [ "assert_matches", "async-trait", "futures", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", @@ -6840,7 +6917,7 @@ version = "4.0.0-dev" source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9.42#b0de7e79a3cfba77a9e380f4be00fa98c23d498c" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6869,7 +6946,7 @@ name = "sc-rpc-api" version = "0.10.0-dev" source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9.42#b0de7e79a3cfba77a9e380f4be00fa98c23d498c" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", @@ -6889,7 +6966,7 @@ version = "4.0.0-dev" source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9.42#b0de7e79a3cfba77a9e380f4be00fa98c23d498c" dependencies = [ "http", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "serde_json", "substrate-prometheus-endpoint", @@ -6907,7 +6984,7 @@ dependencies = [ "futures", "futures-util", "hex", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6934,7 +7011,7 @@ dependencies = [ "exit-future", "futures", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -8411,7 +8488,7 @@ source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9. dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-rpc-api", @@ -8441,7 +8518,7 @@ version = "0.10.0-dev" source = "git+https://github.com/grindytech/substrate?branch=gafi-polkadot-v0.9.42#b0de7e79a3cfba77a9e380f4be00fa98c23d498c" dependencies = [ "async-trait", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "sc-rpc-api", "serde", @@ -8577,18 +8654,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "d9207952ae1a003f42d3d5e892dac3c6ba42aa6ac0c79a6a91a2b5cb4253e75c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "f1728216d3244de4f14f14f8c15c79be1a7c67867d28d69b719690e2a19fb445" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 100c24f3..ce287309 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ bn = {package = "substrate-bn", version = "0.6", default-features = false} environmental = {version = "1.1.3", default-features = false} ethereum-types = {version = "0.14.1", default-features = false} evm = {version = "0.37.0", default-features = false} -jsonrpsee = "0.16.2" +jsonrpsee = "0.20.0" kvdb-rocksdb = "0.17.0" libsecp256k1 = "0.7.1" parity-db = "0.4.10" diff --git a/node/game3/Cargo.toml b/node/game3/Cargo.toml index 5e8c5ce9..5d93cdc9 100644 --- a/node/game3/Cargo.toml +++ b/node/game3/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] clap = {version = "4.3.21", features = ["derive"]} futures = {version = "0.3.21", features = ["thread-pool"]} -jsonrpsee = {version = "0.16.2", features = ["server"]} +jsonrpsee = {version = "0.20.0", features = ["server"]} hex-literal = "0.4.1" frame-system = {workspace = true}