Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

rpc server with HTTP/WS on the same socket #12663

Merged
merged 15 commits into from
Dec 12, 2022
Merged

rpc server with HTTP/WS on the same socket #12663

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
45faece
jsonrpsee v0.16
niklasad1 Nov 9, 2022
981ccd2
cargo fmt
niklasad1 Nov 18, 2022
f79c774
update jsonrpsee 0.16.1
niklasad1 Nov 18, 2022
e5f4678
less verbose cors log
niklasad1 Nov 23, 2022
e676d4a
fix nit in log: WS -> HTTP
niklasad1 Nov 23, 2022
9eb9006
revert needless changes in Cargo.lock
niklasad1 Nov 23, 2022
ad5ba6e
remove unused features in tower
niklasad1 Nov 23, 2022
eca4168
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.16
niklasad1 Nov 25, 2022
4fd2eb2
Merge remote-tracking branch 'origin/master' into HEAD
niklasad1 Nov 29, 2022
8202ad0
fix nits; add client-core feature
niklasad1 Nov 29, 2022
f2cfadd
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.16
niklasad1 Dec 1, 2022
9b0b6c6
jsonrpsee v0.16.2
niklasad1 Dec 2, 2022
05001fe
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.16
niklasad1 Dec 5, 2022
90ac76b
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.16
niklasad1 Dec 9, 2022
8601c4d
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.16
niklasad1 Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 90 additions & 74 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion bin/node-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../frame/transaction-payment" }

# These dependencies are used for the node template's RPCs
jsonrpsee = { version = "0.15.1", features = ["server"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }
sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ array-bytes = "4.1"
clap = { version = "4.0.9", features = ["derive"], optional = true }
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.136", features = ["derive"] }
jsonrpsee = { version = "0.15.1", features = ["server"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }
futures = "0.3.21"
log = "0.4.17"
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion bin/node/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
jsonrpsee = { version = "0.15.1", features = ["server"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }
node-primitives = { version = "2.0.0", path = "../primitives" }
pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" }
mmr-rpc = { version = "4.0.0-dev", path = "../../../client/merkle-mountain-range/rpc/" }
Expand Down
2 changes: 1 addition & 1 deletion client/beefy/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ homepage = "https://substrate.io"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
futures = "0.3.21"
jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
log = "0.4"
parking_lot = "0.12.1"
serde = { version = "1.0.136", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion client/beefy/rpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mod tests {
};
use beefy_primitives::{known_payloads, Payload, SignedCommitment};
use codec::{Decode, Encode};
use jsonrpsee::{types::EmptyParams, RpcModule};
use jsonrpsee::{types::EmptyServerParams as EmptyParams, RpcModule};
use sp_runtime::traits::{BlakeTwo256, Hash};
use substrate_test_runtime_client::runtime::Block;

Expand Down
Loading