mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-15 04:31:08 +00:00
29c0c6a4a8
* 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>
328 lines
9.8 KiB
Rust
328 lines
9.8 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#![warn(missing_docs)]
|
|
#![warn(unused_crate_dependencies)]
|
|
|
|
//! Node-specific RPC methods for interaction with Merkle Mountain Range pallet.
|
|
|
|
use std::{marker::PhantomData, sync::Arc};
|
|
|
|
use codec::{Codec, Encode};
|
|
use jsonrpsee::{
|
|
core::{async_trait, RpcResult},
|
|
proc_macros::rpc,
|
|
types::error::{CallError, ErrorObject},
|
|
};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use sp_api::ProvideRuntimeApi;
|
|
use sp_blockchain::HeaderBackend;
|
|
use sp_core::Bytes;
|
|
use sp_mmr_primitives::{BatchProof, Error as MmrError, LeafIndex, Proof};
|
|
use sp_runtime::{generic::BlockId, traits::Block as BlockT};
|
|
|
|
pub use sp_mmr_primitives::MmrApi as MmrRuntimeApi;
|
|
|
|
const RUNTIME_ERROR: i32 = 8000;
|
|
const MMR_ERROR: i32 = 8010;
|
|
const LEAF_NOT_FOUND_ERROR: i32 = MMR_ERROR + 1;
|
|
const GENERATE_PROOF_ERROR: i32 = MMR_ERROR + 2;
|
|
|
|
/// Retrieved MMR leaf and its proof.
|
|
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct LeafProof<BlockHash> {
|
|
/// Block hash the proof was generated for.
|
|
pub block_hash: BlockHash,
|
|
/// SCALE-encoded leaf data.
|
|
pub leaf: Bytes,
|
|
/// SCALE-encoded proof data. See [sp_mmr_primitives::Proof].
|
|
pub proof: Bytes,
|
|
}
|
|
|
|
impl<BlockHash> LeafProof<BlockHash> {
|
|
/// Create new `LeafProof` from given concrete `leaf` and `proof`.
|
|
pub fn new<Leaf, MmrHash>(block_hash: BlockHash, leaf: Leaf, proof: Proof<MmrHash>) -> Self
|
|
where
|
|
Leaf: Encode,
|
|
MmrHash: Encode,
|
|
{
|
|
Self { block_hash, leaf: Bytes(leaf.encode()), proof: Bytes(proof.encode()) }
|
|
}
|
|
}
|
|
|
|
/// Retrieved MMR leaves and their proof.
|
|
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct LeafBatchProof<BlockHash> {
|
|
/// Block hash the proof was generated for.
|
|
pub block_hash: BlockHash,
|
|
/// SCALE-encoded vector of `LeafData`.
|
|
pub leaves: Bytes,
|
|
/// SCALE-encoded proof data. See [sp_mmr_primitives::BatchProof].
|
|
pub proof: Bytes,
|
|
}
|
|
|
|
impl<BlockHash> LeafBatchProof<BlockHash> {
|
|
/// Create new `LeafBatchProof` from a given vector of `Leaf` and a
|
|
/// [sp_mmr_primitives::BatchProof].
|
|
pub fn new<Leaf, MmrHash>(
|
|
block_hash: BlockHash,
|
|
leaves: Vec<Leaf>,
|
|
proof: BatchProof<MmrHash>,
|
|
) -> Self
|
|
where
|
|
Leaf: Encode,
|
|
MmrHash: Encode,
|
|
{
|
|
Self { block_hash, leaves: Bytes(leaves.encode()), proof: Bytes(proof.encode()) }
|
|
}
|
|
}
|
|
|
|
/// MMR RPC methods.
|
|
#[rpc(client, server)]
|
|
pub trait MmrApi<BlockHash> {
|
|
/// Generate MMR proof for given leaf index.
|
|
///
|
|
/// This method calls into a runtime with MMR pallet included and attempts to generate
|
|
/// MMR proof for leaf at given `leaf_index`.
|
|
/// Optionally, a block hash at which the runtime should be queried can be specified.
|
|
///
|
|
/// Returns the (full) leaf itself and a proof for this leaf (compact encoding, i.e. hash of
|
|
/// the leaf). Both parameters are SCALE-encoded.
|
|
#[method(name = "mmr_generateProof")]
|
|
fn generate_proof(
|
|
&self,
|
|
leaf_index: LeafIndex,
|
|
at: Option<BlockHash>,
|
|
) -> RpcResult<LeafProof<BlockHash>>;
|
|
|
|
/// Generate MMR proof for the given leaf indices.
|
|
///
|
|
/// This method calls into a runtime with MMR pallet included and attempts to generate
|
|
/// MMR proof for a set of leaves at the given `leaf_indices`.
|
|
/// Optionally, a block hash at which the runtime should be queried can be specified.
|
|
///
|
|
/// Returns the leaves and a proof for these leaves (compact encoding, i.e. hash of
|
|
/// the leaves). Both parameters are SCALE-encoded.
|
|
/// The order of entries in the `leaves` field of the returned struct
|
|
/// is the same as the order of the entries in `leaf_indices` supplied
|
|
#[method(name = "mmr_generateBatchProof")]
|
|
fn generate_batch_proof(
|
|
&self,
|
|
leaf_indices: Vec<LeafIndex>,
|
|
at: Option<BlockHash>,
|
|
) -> RpcResult<LeafBatchProof<BlockHash>>;
|
|
}
|
|
|
|
/// MMR RPC methods.
|
|
pub struct MmrRpc<Client, Block> {
|
|
client: Arc<Client>,
|
|
_marker: PhantomData<Block>,
|
|
}
|
|
|
|
impl<C, B> MmrRpc<C, B> {
|
|
/// Create new `Mmr` with the given reference to the client.
|
|
pub fn new(client: Arc<C>) -> Self {
|
|
Self { client, _marker: Default::default() }
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl<Client, Block, MmrHash> MmrApiServer<<Block as BlockT>::Hash>
|
|
for MmrRpc<Client, (Block, MmrHash)>
|
|
where
|
|
Block: BlockT,
|
|
Client: Send + Sync + 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
|
|
Client::Api: MmrRuntimeApi<Block, MmrHash>,
|
|
MmrHash: Codec + Send + Sync + 'static,
|
|
{
|
|
fn generate_proof(
|
|
&self,
|
|
leaf_index: LeafIndex,
|
|
at: Option<<Block as BlockT>::Hash>,
|
|
) -> RpcResult<LeafProof<Block::Hash>> {
|
|
let api = self.client.runtime_api();
|
|
let block_hash = at.unwrap_or_else(|| self.client.info().best_hash);
|
|
|
|
let (leaf, proof) = api
|
|
.generate_proof_with_context(
|
|
&BlockId::hash(block_hash),
|
|
sp_core::ExecutionContext::OffchainCall(None),
|
|
leaf_index,
|
|
)
|
|
.map_err(runtime_error_into_rpc_error)?
|
|
.map_err(mmr_error_into_rpc_error)?;
|
|
|
|
Ok(LeafProof::new(block_hash, leaf, proof))
|
|
}
|
|
|
|
fn generate_batch_proof(
|
|
&self,
|
|
leaf_indices: Vec<LeafIndex>,
|
|
at: Option<<Block as BlockT>::Hash>,
|
|
) -> RpcResult<LeafBatchProof<<Block as BlockT>::Hash>> {
|
|
let api = self.client.runtime_api();
|
|
let block_hash = at.unwrap_or_else(||
|
|
// If the block hash is not supplied assume the best block.
|
|
self.client.info().best_hash);
|
|
|
|
let (leaves, proof) = api
|
|
.generate_batch_proof_with_context(
|
|
&BlockId::hash(block_hash),
|
|
sp_core::ExecutionContext::OffchainCall(None),
|
|
leaf_indices,
|
|
)
|
|
.map_err(runtime_error_into_rpc_error)?
|
|
.map_err(mmr_error_into_rpc_error)?;
|
|
|
|
Ok(LeafBatchProof::new(block_hash, leaves, proof))
|
|
}
|
|
}
|
|
|
|
/// Converts a mmr-specific error into a [`CallError`].
|
|
fn mmr_error_into_rpc_error(err: MmrError) -> CallError {
|
|
let data = format!("{:?}", err);
|
|
match err {
|
|
MmrError::LeafNotFound => CallError::Custom(ErrorObject::owned(
|
|
LEAF_NOT_FOUND_ERROR,
|
|
"Leaf was not found",
|
|
Some(data),
|
|
)),
|
|
MmrError::GenerateProof => CallError::Custom(ErrorObject::owned(
|
|
GENERATE_PROOF_ERROR,
|
|
"Error while generating the proof",
|
|
Some(data),
|
|
)),
|
|
_ => CallError::Custom(ErrorObject::owned(MMR_ERROR, "Unexpected MMR error", Some(data))),
|
|
}
|
|
}
|
|
|
|
/// Converts a runtime trap into a [`CallError`].
|
|
fn runtime_error_into_rpc_error(err: impl std::fmt::Debug) -> CallError {
|
|
CallError::Custom(ErrorObject::owned(
|
|
RUNTIME_ERROR,
|
|
"Runtime trapped",
|
|
Some(format!("{:?}", err)),
|
|
))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use sp_core::H256;
|
|
|
|
#[test]
|
|
fn should_serialize_leaf_proof() {
|
|
// given
|
|
let leaf = vec![1_u8, 2, 3, 4];
|
|
let proof = Proof {
|
|
leaf_index: 1,
|
|
leaf_count: 9,
|
|
items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
|
|
};
|
|
|
|
let leaf_proof = LeafProof::new(H256::repeat_byte(0), leaf, proof);
|
|
|
|
// when
|
|
let actual = serde_json::to_string(&leaf_proof).unwrap();
|
|
|
|
// then
|
|
assert_eq!(
|
|
actual,
|
|
r#"{"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000","leaf":"0x1001020304","proof":"0x010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"}"#
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn should_serialize_leaf_batch_proof() {
|
|
// given
|
|
let leaf = vec![1_u8, 2, 3, 4];
|
|
let proof = BatchProof {
|
|
leaf_indices: vec![1],
|
|
leaf_count: 9,
|
|
items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
|
|
};
|
|
|
|
let leaf_proof = LeafBatchProof::new(H256::repeat_byte(0), vec![leaf], proof);
|
|
|
|
// when
|
|
let actual = serde_json::to_string(&leaf_proof).unwrap();
|
|
|
|
// then
|
|
assert_eq!(
|
|
actual,
|
|
r#"{"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000","leaves":"0x041001020304","proof":"0x04010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"}"#
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn should_deserialize_leaf_proof() {
|
|
// given
|
|
let expected = LeafProof {
|
|
block_hash: H256::repeat_byte(0),
|
|
leaf: Bytes(vec![1_u8, 2, 3, 4].encode()),
|
|
proof: Bytes(
|
|
Proof {
|
|
leaf_index: 1,
|
|
leaf_count: 9,
|
|
items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
|
|
}
|
|
.encode(),
|
|
),
|
|
};
|
|
|
|
// when
|
|
let actual: LeafProof<H256> = serde_json::from_str(r#"{
|
|
"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"leaf":"0x1001020304",
|
|
"proof":"0x010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"
|
|
}"#).unwrap();
|
|
|
|
// then
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn should_deserialize_leaf_batch_proof() {
|
|
// given
|
|
let expected = LeafBatchProof {
|
|
block_hash: H256::repeat_byte(0),
|
|
leaves: Bytes(vec![vec![1_u8, 2, 3, 4]].encode()),
|
|
proof: Bytes(
|
|
BatchProof {
|
|
leaf_indices: vec![1],
|
|
leaf_count: 9,
|
|
items: vec![H256::repeat_byte(1), H256::repeat_byte(2)],
|
|
}
|
|
.encode(),
|
|
),
|
|
};
|
|
|
|
// when
|
|
let actual: LeafBatchProof<H256> = serde_json::from_str(r#"{
|
|
"blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"leaves":"0x041001020304",
|
|
"proof":"0x04010000000000000009000000000000000801010101010101010101010101010101010101010101010101010101010101010202020202020202020202020202020202020202020202020202020202020202"
|
|
}"#).unwrap();
|
|
|
|
// then
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|