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

jsonrpsee proc macros #9673

Merged
niklasad1 merged 24 commits into from
Sep 3, 2021
Merged

jsonrpsee proc macros #9673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ee7f7e6
port error types to `JsonRpseeError`
niklasad1 Aug 20, 2021
289888f
migrate chain module to proc macro api
niklasad1 Aug 22, 2021
f24c30b
make it compile with proc macros
niklasad1 Aug 23, 2021
abb72a3
update branch
niklasad1 Aug 28, 2021
9017419
update branch
niklasad1 Sep 1, 2021
bad4062
update to jsonrpsee master
niklasad1 Sep 1, 2021
c3e1a07
Merge remote-tracking branch 'origin/dp-jsonrpsee-integration-2' into…
niklasad1 Sep 1, 2021
93372de
port system rpc
niklasad1 Sep 2, 2021
f54b3bb
port state rpc
niklasad1 Sep 2, 2021
48fa5d7
port childstate & offchain
niklasad1 Sep 2, 2021
e0fcdd5
frame system rpc
niklasad1 Sep 2, 2021
c6dcc27
frame transaction payment
niklasad1 Sep 2, 2021
8721729
bring back CORS hack to work with polkadot UI
niklasad1 Sep 2, 2021
ded670b
port babe rpc
niklasad1 Sep 3, 2021
549f881
port manual seal rpc
niklasad1 Sep 3, 2021
bbb9a11
port frame mmr rpc
niklasad1 Sep 3, 2021
8afce22
port frame contracts rpc
niklasad1 Sep 3, 2021
29482db
port finality grandpa rpc
niklasad1 Sep 3, 2021
75286ed
port sync state rpc
niklasad1 Sep 3, 2021
4471cb7
resolve a few TODO + no jsonrpc deps
niklasad1 Sep 3, 2021
868424c
Update bin/node/rpc-client/src/main.rs
niklasad1 Sep 3, 2021
03e1b20
Update bin/node/rpc-client/src/main.rs
niklasad1 Sep 3, 2021
e4813a1
Update bin/node/rpc-client/src/main.rs
niklasad1 Sep 3, 2021
ada03c0
Update bin/node/rpc-client/src/main.rs
niklasad1 Sep 3, 2021
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
Prev Previous commit
Next Next commit
update branch
  • Loading branch information
@niklasad1
niklasad1 committed Aug 28, 2021
commit abb72a34ad97716925f810e317e7b00899eb83d5
32 changes: 16 additions & 16 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 @@ -38,7 +38,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }

# These dependencies are used for the node template's RPCs
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", 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 @@ -34,7 +34,7 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
# third-party dependencies
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
serde = { version = "1.0.126", features = ["derive"] }
futures = "0.3.16"
hex-literal = "0.3.1"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/babe/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
sc-consensus-babe = { version = "0.10.0-dev", path = "../" }
sc-rpc-api = { version = "0.10.0-dev", path = "../../../rpc-api" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../../../primitives/consensus/babe" }
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/manual-seal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
derive_more = "0.99.2"
futures = "0.3.9"

jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
log = "0.4.8"
codec = { package = "parity-scale-codec", version = "2.0.0" }
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion client/finality-grandpa/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
futures = { version = "0.3.4", features = ["compat"] }
serde = { version = "1.0.105", features = ["derive"] }
serde_json = "1.0.50"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
serde = { version = "1.0.126", features = ["derive"] }
serde_json = "1.0.41"

jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["full"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["full"] }

sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-servers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ serde_json = "1.0.41"

[target.'cfg(not(target_os = "unknown"))'.dependencies]
futures-channel = "0.3"
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
tokio = { version = "1", features = ["full"] }
2 changes: 1 addition & 1 deletion client/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
hash-db = { version = "0.15.2", default-features = false }
parking_lot = "0.11.1"
lazy_static = { version = "1.4.0", optional = true }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion client/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ wasmtime = ["sc-executor/wasmtime"]
test-helpers = []

[dependencies]
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }

thiserror = "1.0.21"
futures01 = { package = "futures", version = "0.1.29" }
Expand Down
2 changes: 1 addition & 1 deletion client/sync-state-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
thiserror = "1.0.21"
anyhow = "1"
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }

sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
Expand Down
2 changes: 1 addition & 1 deletion frame/contracts/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2" }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"

Expand Down
2 changes: 1 addition & 1 deletion frame/merkle-mountain-range/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
serde_json = "1"
serde = { version = "1.0.126", features = ["derive"] }

Expand Down
2 changes: 1 addition & 1 deletion frame/transaction-payment/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" }

jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }

sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
Expand Down
2 changes: 1 addition & 1 deletion test-utils/test-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ tokio = { version = "1", features = ["full"] }

# Calling RPC

jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
num-traits = "0.2.14"
6 changes: 3 additions & 3 deletions utils/frame/remote-externalities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features =
"tokio02",
] }
jsonrpsee-proc-macros = "0.3.0"
# jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics" }
# # jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", default-features = false, features = [
# jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441" }
# # jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", default-features = false, features = [
# # "tokio02",
# # ] }
# jsonrpsee-proc-macros = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics" }
# jsonrpsee-proc-macros = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441" }

env_logger = "0.9"
log = "0.4.11"
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/rpc/system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde_json = "1"
sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
futures = { version = "0.3.4", features = ["compat"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-proc-macros-generics", features = ["server"] }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
log = "0.4.8"
sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }
Expand Down