mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 13:31:10 +00:00
jsonrpsee integration (#8783)
* Add tokio * No need to map CallError to CallError * jsonrpsee proc macros (#9673) * port error types to `JsonRpseeError` * migrate chain module to proc macro api * make it compile with proc macros * update branch * update branch * update to jsonrpsee master * port system rpc * port state rpc * port childstate & offchain * frame system rpc * frame transaction payment * bring back CORS hack to work with polkadot UI * port babe rpc * port manual seal rpc * port frame mmr rpc * port frame contracts rpc * port finality grandpa rpc * port sync state rpc * resolve a few TODO + no jsonrpc deps * Update bin/node/rpc-client/src/main.rs * Update bin/node/rpc-client/src/main.rs * Update bin/node/rpc-client/src/main.rs * Update bin/node/rpc-client/src/main.rs * Port over system_ rpc tests * Make it compile * Use prost 0.8 * Use prost 0.8 * Make it compile * Ignore more failing tests * Comment out WIP tests * fix nit in frame system api * Update lockfile * No more juggling tokio versions * No more wait_for_stop ? * Remove browser-testing * Arguments must be arrays * Use same argument names * Resolve todo: no wait_for_stop for WS server Add todo: is parse_rpc_result used? Cleanup imports * fmt * log * One test passes * update jsonrpsee * update jsonrpsee * cleanup rpc-servers crate * jsonrpsee: add host and origin filtering (#9787) * add access control in the jsonrpsee servers * use master * fix nits * rpc runtime_version safe * fix nits * fix grumbles * remove unused files * resolve some todos * jsonrpsee more cleanup (#9803) * more cleanup * resolve TODOs * fix some unwraps * remove type hints * update jsonrpsee * downgrade zeroize * pin jsonrpsee rev * remove unwrap nit * Comment out more tests that aren't ported * Comment out more tests * Fix tests after merge * Subscription test * Invalid nonce test * Pending exts * WIP removeExtrinsic test * Test remove_extrinsic * Make state test: should_return_storage work * Uncomment/fix the other non-subscription related state tests * test: author_insertKey * test: author_rotateKeys * Get rest of state tests passing * asyncify a little more * Add todo to note #msg change * Crashing test for has_session_keys * Fix error conversion to avoid stack overflows Port author_hasSessionKeys test fmt * test author_hasKey * Add two missing tests Add a check on the return type Add todos for James's concerns * RPC tests for state, author and system (#9859) * Fix test runner * Impl Default for SubscriptionTaskExecutor * Keep the minimul amount of code needed to compile tests * Re-instate `RpcSession` (for now) * cleanup * Port over RPC tests * Add tokio * No need to map CallError to CallError * Port over system_ rpc tests * Make it compile * Use prost 0.8 * Use prost 0.8 * Make it compile * Ignore more failing tests * Comment out WIP tests * Update lockfile * No more juggling tokio versions * No more wait_for_stop ? * Remove browser-testing * Arguments must be arrays * Use same argument names * Resolve todo: no wait_for_stop for WS server Add todo: is parse_rpc_result used? Cleanup imports * fmt * log * One test passes * Comment out more tests that aren't ported * Comment out more tests * Fix tests after merge * Subscription test * Invalid nonce test * Pending exts * WIP removeExtrinsic test * Test remove_extrinsic * Make state test: should_return_storage work * Uncomment/fix the other non-subscription related state tests * test: author_insertKey * test: author_rotateKeys * Get rest of state tests passing * asyncify a little more * Add todo to note #msg change * Crashing test for has_session_keys * Fix error conversion to avoid stack overflows Port author_hasSessionKeys test fmt * test author_hasKey * Add two missing tests Add a check on the return type Add todos for James's concerns * offchain rpc tests * Address todos * fmt Co-authored-by: James Wilson <james@jsdw.me> * fix drop in state test * update jsonrpsee * fix ignored system test * fix chain tests * remove some boiler plate * Port BEEFY RPC (#9883) * Merge master * Port beefy RPC (ty @niklas!) * trivial changes left over from merge * Remove unused code * Update jsonrpsee * fix build * make tests compile again * beefy update jsonrpsee * fix: respect rpc methods policy * update cargo.lock * update jsonrpsee * update jsonrpsee * downgrade error logs * update jsonrpsee * Fix typo * remove unused file * Better name * Port Babe RPC tests * Put docs back * Resolve todo * Port tests for System RPCs * Resolve todo * fix build * Updated jsonrpsee to current master * fix: port finality grandpa rpc tests * Move .into() outside of the match * more review grumbles * jsonrpsee: add `rpc handlers` back (#10245) * add back RpcHandlers * cargo fmt * fix docs * fix grumble: remove needless alloc * resolve TODO * fmt * Fix typo * grumble: Use constants based on BASE_ERROR * grumble: DRY whitelisted listening addresses grumble: s/JSONRPC/JSON-RPC/ * cleanup * grumbles: Making readers aware of the possibility of gaps * review grumbles * grumbles * remove notes from niklasad1 * Update `jsonrpsee` * fix: jsonrpsee features * jsonrpsee: fallback to random port in case the specified port failed (#10304) * jsonrpsee: fallback to random port * better comment * Update client/rpc-servers/src/lib.rs Co-authored-by: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com> * Update client/rpc-servers/src/lib.rs Co-authored-by: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com> * address grumbles * cargo fmt * addrs already slice Co-authored-by: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com> * Update jsonrpsee to 092081a0a2b8904c6ebd2cd99e16c7bc13ffc3ae * lockfile * update jsonrpsee * fix warning * Don't fetch jsonrpsee from crates * make tests compile again * fix rpc tests * remove unused deps * update tokio * fix rpc tests again * fix: test runner `HttpServerBuilder::builder` fails unless it's called within tokio runtime * cargo fmt * grumbles: fix subscription aliases * make clippy happy * update remaining subscriptions alias * cleanup * cleanup * fix chain subscription: less boiler plate (#10285) * fix chain subscription: less boiler plate * fix bad merge * cargo fmt * Switch to jsonrpsee 0.5 * fix build * add missing features * fix nit: remove needless Box::pin * Integrate jsonrpsee metrics (#10395) * draft metrics impl * Use latest api * Add missing file * Http server metrics * cleanup * bump jsonrpsee * Remove `ServerMetrics` and use a single middleware for both connection counting (aka sessions) and call metrics. * fix build * remove needless Arc::clone * Update to jsonrpsee 0.6 * lolz * fix metrics * Revert "lolz" This reverts commit eed6c6a56e78d8e307b4950f4c52a1c3a2322ba1. * fix: in-memory rpc support subscriptions * commit Cargo.lock * Update tests to 0.7 * fix TODOs * ws server: generate subscriptionIDs as Strings Some libraries seems to expect the subscription IDs to be Strings, let's not break this in this PR. * Increase timeout * Port over tests * cleanup * Using error codes from the spec * fix clippy * cargo fmt * update jsonrpsee * fix nits * fix: rpc_query * enable custom subid gen through spawn_tasks * remove unsed deps * unify tokio deps * Revert "enable custom subid gen through spawn_tasks" This reverts commit 5c5eb70328fe39d154fdb55c56e637b4548cf470. * fix bad merge of `test-utils` * fix more nits * downgrade wasm-instrument to 0.1.0 * [jsonrpsee]: enable custom RPC subscription ID generatation (#10731) * enable custom subid gen through spawn_tasks * fix nits * Update client/service/src/builder.rs Co-authored-by: David <dvdplm@gmail.com> * add Poc; needs jsonrpsee pr * update jsonrpsee * add re-exports * add docs Co-authored-by: David <dvdplm@gmail.com> * cargo fmt * fmt * port RPC-API dev * Remove unused file * fix nit: remove async trait * fix doc links * fix merge nit: remove jsonrpc deps * kill namespace on rpc apis * companion for jsonrpsee v0.10 (#11158) * companion for jsonrpsee v0.10 * update versions v0.10.0 * add some fixes * spelling * fix spaces Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com> * send error before subs are closed * fix unsubscribe method names: chain * fix tests * jsonrpc server: print binded local address * grumbles: kill SubscriptionTaskExecutor * Update client/sync-state-rpc/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/rpc/src/chain/chain_full.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/rpc/src/chain/chain_full.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * sync-state-rpc: kill anyhow * no more anyhow * remove todo * jsonrpsee: fix bad params in subscriptions. (#11251) * update jsonrpsee * fix error responses * revert error codes * dont do weird stuff in drop impl * rpc servers: remove needless clone * Remove silly constants * chore: update jsonrpsee v0.12 * commit Cargo.lock * deps: downgrade git2 * feat: CLI flag max subscriptions per connection * metrics: use old logging format * fix: read WS address from substrate output (#11379) Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com> Co-authored-by: James Wilson <james@jsdw.me> Co-authored-by: Maciej Hirsz <hello@maciej.codes> Co-authored-by: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
David
@@ -28,7 +28,7 @@ pub use sc_client_api::{
|
||||
};
|
||||
pub use sc_client_db::{self, Backend};
|
||||
pub use sc_executor::{self, NativeElseWasmExecutor, WasmExecutionMethod};
|
||||
pub use sc_service::{client, RpcHandlers, RpcSession};
|
||||
pub use sc_service::{client, RpcHandlers};
|
||||
pub use sp_consensus;
|
||||
pub use sp_keyring::{
|
||||
ed25519::Keyring as Ed25519Keyring, sr25519::Keyring as Sr25519Keyring, AccountKeyring,
|
||||
@@ -37,10 +37,7 @@ pub use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
|
||||
pub use sp_runtime::{Storage, StorageChild};
|
||||
pub use sp_state_machine::ExecutionStrategy;
|
||||
|
||||
use futures::{
|
||||
future::{Future, FutureExt},
|
||||
stream::StreamExt,
|
||||
};
|
||||
use futures::{future::Future, stream::StreamExt};
|
||||
use sc_client_api::BlockchainEvents;
|
||||
use sc_service::client::{ClientConfig, LocalCallExecutor};
|
||||
use serde::Deserialize;
|
||||
@@ -297,16 +294,14 @@ impl<Block: BlockT, D, Backend, G: GenesisInit>
|
||||
/// The output of an RPC transaction.
|
||||
pub struct RpcTransactionOutput {
|
||||
/// The output string of the transaction if any.
|
||||
pub result: Option<String>,
|
||||
/// The session object.
|
||||
pub session: RpcSession,
|
||||
pub result: String,
|
||||
/// An async receiver if data will be returned via a callback.
|
||||
pub receiver: futures::channel::mpsc::UnboundedReceiver<String>,
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for RpcTransactionOutput {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
write!(f, "RpcTransactionOutput {{ result: {:?}, session, receiver }}", self.result)
|
||||
write!(f, "RpcTransactionOutput {{ result: {:?}, receiver }}", self.result)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,56 +323,51 @@ impl std::fmt::Display for RpcTransactionError {
|
||||
}
|
||||
|
||||
/// An extension trait for `RpcHandlers`.
|
||||
#[async_trait::async_trait]
|
||||
pub trait RpcHandlersExt {
|
||||
/// Send a transaction through the RpcHandlers.
|
||||
fn send_transaction(
|
||||
async fn send_transaction(
|
||||
&self,
|
||||
extrinsic: OpaqueExtrinsic,
|
||||
) -> Pin<Box<dyn Future<Output = Result<RpcTransactionOutput, RpcTransactionError>> + Send>>;
|
||||
) -> Result<RpcTransactionOutput, RpcTransactionError>;
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl RpcHandlersExt for RpcHandlers {
|
||||
fn send_transaction(
|
||||
async fn send_transaction(
|
||||
&self,
|
||||
extrinsic: OpaqueExtrinsic,
|
||||
) -> Pin<Box<dyn Future<Output = Result<RpcTransactionOutput, RpcTransactionError>> + Send>> {
|
||||
let (tx, rx) = futures::channel::mpsc::unbounded();
|
||||
let mem = RpcSession::new(tx);
|
||||
Box::pin(
|
||||
self.rpc_query(
|
||||
&mem,
|
||||
&format!(
|
||||
r#"{{
|
||||
) -> Result<RpcTransactionOutput, RpcTransactionError> {
|
||||
let (result, rx) = self
|
||||
.rpc_query(&format!(
|
||||
r#"{{
|
||||
"jsonrpc": "2.0",
|
||||
"method": "author_submitExtrinsic",
|
||||
"params": ["0x{}"],
|
||||
"id": 0
|
||||
}}"#,
|
||||
hex::encode(extrinsic.encode())
|
||||
),
|
||||
)
|
||||
.map(move |result| parse_rpc_result(result, mem, rx)),
|
||||
)
|
||||
hex::encode(extrinsic.encode())
|
||||
))
|
||||
.await
|
||||
.expect("valid JSON-RPC request object; qed");
|
||||
parse_rpc_result(result, rx)
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn parse_rpc_result(
|
||||
result: Option<String>,
|
||||
session: RpcSession,
|
||||
result: String,
|
||||
receiver: futures::channel::mpsc::UnboundedReceiver<String>,
|
||||
) -> Result<RpcTransactionOutput, RpcTransactionError> {
|
||||
if let Some(ref result) = result {
|
||||
let json: serde_json::Value =
|
||||
serde_json::from_str(result).expect("the result can only be a JSONRPC string; qed");
|
||||
let error = json.as_object().expect("JSON result is always an object; qed").get("error");
|
||||
let json: serde_json::Value =
|
||||
serde_json::from_str(&result).expect("the result can only be a JSONRPC string; qed");
|
||||
let error = json.as_object().expect("JSON result is always an object; qed").get("error");
|
||||
|
||||
if let Some(error) = error {
|
||||
return Err(serde_json::from_value(error.clone())
|
||||
.expect("the JSONRPC result's error is always valid; qed"))
|
||||
}
|
||||
if let Some(error) = error {
|
||||
return Err(serde_json::from_value(error.clone())
|
||||
.expect("the JSONRPC result's error is always valid; qed"))
|
||||
}
|
||||
|
||||
Ok(RpcTransactionOutput { result, session, receiver })
|
||||
Ok(RpcTransactionOutput { result, receiver })
|
||||
}
|
||||
|
||||
/// An extension trait for `BlockchainEvents`.
|
||||
@@ -418,40 +408,23 @@ where
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use sc_service::RpcSession;
|
||||
|
||||
fn create_session_and_receiver(
|
||||
) -> (RpcSession, futures::channel::mpsc::UnboundedReceiver<String>) {
|
||||
let (tx, rx) = futures::channel::mpsc::unbounded();
|
||||
let mem = RpcSession::new(tx.into());
|
||||
|
||||
(mem, rx)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_error_properly() {
|
||||
let (mem, rx) = create_session_and_receiver();
|
||||
assert!(super::parse_rpc_result(None, mem, rx).is_ok());
|
||||
|
||||
let (mem, rx) = create_session_and_receiver();
|
||||
let (_, rx) = futures::channel::mpsc::unbounded();
|
||||
assert!(super::parse_rpc_result(
|
||||
Some(
|
||||
r#"{
|
||||
r#"{
|
||||
"jsonrpc": "2.0",
|
||||
"result": 19,
|
||||
"id": 1
|
||||
}"#
|
||||
.to_string()
|
||||
),
|
||||
mem,
|
||||
.to_string(),
|
||||
rx
|
||||
)
|
||||
.is_ok(),);
|
||||
.is_ok());
|
||||
|
||||
let (mem, rx) = create_session_and_receiver();
|
||||
let (_, rx) = futures::channel::mpsc::unbounded();
|
||||
let error = super::parse_rpc_result(
|
||||
Some(
|
||||
r#"{
|
||||
r#"{
|
||||
"jsonrpc": "2.0",
|
||||
"error": {
|
||||
"code": -32601,
|
||||
@@ -459,9 +432,7 @@ mod tests {
|
||||
},
|
||||
"id": 1
|
||||
}"#
|
||||
.to_string(),
|
||||
),
|
||||
mem,
|
||||
.to_string(),
|
||||
rx,
|
||||
)
|
||||
.unwrap_err();
|
||||
@@ -469,10 +440,9 @@ mod tests {
|
||||
assert_eq!(error.message, "Method not found");
|
||||
assert!(error.data.is_none());
|
||||
|
||||
let (mem, rx) = create_session_and_receiver();
|
||||
let (_, rx) = futures::channel::mpsc::unbounded();
|
||||
let error = super::parse_rpc_result(
|
||||
Some(
|
||||
r#"{
|
||||
r#"{
|
||||
"jsonrpc": "2.0",
|
||||
"error": {
|
||||
"code": -32601,
|
||||
@@ -481,9 +451,7 @@ mod tests {
|
||||
},
|
||||
"id": 1
|
||||
}"#
|
||||
.to_string(),
|
||||
),
|
||||
mem,
|
||||
.to_string(),
|
||||
rx,
|
||||
)
|
||||
.unwrap_err();
|
||||
|
||||
Reference in New Issue
Block a user