-
Notifications
You must be signed in to change notification settings - Fork 743
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
archive: Fetch body, genesisHash and header #1560
Merged
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a0a4379
archive/api: Introduce the methods for body/genesis hash
lexnv 72d903c
archive: Introduce archive struct
lexnv 1f1d59e
archive: Implement body and genesis hash
lexnv 0b54a1d
archive/tests: Test genesis and body
lexnv 60b41f2
archive/header: Implement the header method
lexnv 0b32c5c
archive/tests: Test archive_header
lexnv 9ecf0c6
Merge branch 'master' into lexnv/archive_body_genesis
lexnv fa041a3
archive: Remove unsued backend and task executor
lexnv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) Parity Technologies (UK) Ltd. | ||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 | ||
|
||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
||
//! API trait of the archive methods. | ||
|
||
use jsonrpsee::{core::RpcResult, proc_macros::rpc}; | ||
|
||
#[rpc(client, server)] | ||
pub trait ArchiveApi<Hash> { | ||
/// Retrieves the body (list of transactions) of a given block hash. | ||
/// | ||
/// Returns an array of strings containing the hexadecimal-encoded SCALE-codec-encoded | ||
/// transactions in that block. If no block with that hash is found, null. | ||
/// | ||
/// # Unstable | ||
/// | ||
/// This method is unstable and subject to change in the future. | ||
#[method(name = "archive_unstable_body")] | ||
fn archive_unstable_body(&self, hash: Hash) -> RpcResult<Option<Vec<String>>>; | ||
|
||
/// Get the chain's genesis hash. | ||
/// | ||
/// Returns a string containing the hexadecimal-encoded hash of the genesis block of the chain. | ||
/// | ||
/// # Unstable | ||
/// | ||
/// This method is unstable and subject to change in the future. | ||
#[method(name = "archive_unstable_genesisHash")] | ||
fn archive_unstable_genesis_hash(&self) -> RpcResult<String>; | ||
|
||
/// Get the block's header. | ||
/// | ||
/// Returns a string containing the hexadecimal-encoded SCALE-codec encoding header of the | ||
/// block. | ||
/// | ||
/// # Unstable | ||
/// | ||
/// This method is unstable and subject to change in the future. | ||
#[method(name = "archive_unstable_header")] | ||
fn archive_unstable_header(&self, hash: Hash) -> RpcResult<Option<String>>; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) Parity Technologies (UK) Ltd. | ||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 | ||
|
||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
||
//! API implementation for `archive`. | ||
|
||
use super::ArchiveApiServer; | ||
use crate::{chain_head::hex_string, SubscriptionTaskExecutor}; | ||
use codec::Encode; | ||
use jsonrpsee::core::{async_trait, RpcResult}; | ||
use sc_client_api::{Backend, BlockBackend, BlockchainEvents, ExecutorProvider, StorageProvider}; | ||
use sp_api::CallApiAt; | ||
use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; | ||
use sp_runtime::traits::Block as BlockT; | ||
use std::{marker::PhantomData, sync::Arc}; | ||
|
||
/// An API for archive RPC calls. | ||
pub struct Archive<BE: Backend<Block>, Block: BlockT, Client> { | ||
/// Substrate client. | ||
client: Arc<Client>, | ||
/// Backend of the chain. | ||
_backend: Arc<BE>, | ||
/// Executor to spawn subscriptions. | ||
_executor: SubscriptionTaskExecutor, | ||
/// The hexadecimal encoded hash of the genesis block. | ||
genesis_hash: String, | ||
/// Phantom member to pin the block type. | ||
_phantom: PhantomData<Block>, | ||
} | ||
|
||
impl<BE: Backend<Block>, Block: BlockT, Client> Archive<BE, Block, Client> { | ||
/// Create a new [`Archive`]. | ||
pub fn new<GenesisHash: AsRef<[u8]>>( | ||
client: Arc<Client>, | ||
backend: Arc<BE>, | ||
executor: SubscriptionTaskExecutor, | ||
genesis_hash: GenesisHash, | ||
) -> Self { | ||
let genesis_hash = hex_string(&genesis_hash.as_ref()); | ||
Self { | ||
client, | ||
_backend: backend.clone(), | ||
lexnv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
_executor: executor, | ||
genesis_hash, | ||
_phantom: PhantomData, | ||
} | ||
} | ||
} | ||
|
||
#[async_trait] | ||
impl<BE, Block, Client> ArchiveApiServer<Block::Hash> for Archive<BE, Block, Client> | ||
where | ||
Block: BlockT + 'static, | ||
Block::Header: Unpin, | ||
BE: Backend<Block> + 'static, | ||
Client: BlockBackend<Block> | ||
+ ExecutorProvider<Block> | ||
+ HeaderBackend<Block> | ||
+ HeaderMetadata<Block, Error = BlockChainError> | ||
+ BlockchainEvents<Block> | ||
+ CallApiAt<Block> | ||
+ StorageProvider<Block, BE> | ||
+ 'static, | ||
{ | ||
fn archive_unstable_body(&self, hash: Block::Hash) -> RpcResult<Option<Vec<String>>> { | ||
let Ok(Some(signed_block)) = self.client.block(hash) else { return Ok(None) }; | ||
|
||
let extrinsics = signed_block | ||
.block | ||
.extrinsics() | ||
.iter() | ||
.map(|extrinsic| hex_string(&extrinsic.encode())) | ||
.collect(); | ||
|
||
Ok(Some(extrinsics)) | ||
} | ||
|
||
fn archive_unstable_genesis_hash(&self) -> RpcResult<String> { | ||
Ok(self.genesis_hash.clone()) | ||
} | ||
|
||
fn archive_unstable_header(&self, hash: Block::Hash) -> RpcResult<Option<String>> { | ||
let Ok(Some(header)) = self.client.header(hash) else { return Ok(None) }; | ||
|
||
Ok(Some(hex_string(&header.encode()))) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) Parity Technologies (UK) Ltd. | ||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 | ||
|
||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
||
//! Substrate archive API. | ||
//! | ||
//! # Note | ||
//! | ||
//! Methods are prefixed by `archive`. | ||
|
||
#[cfg(test)] | ||
mod tests; | ||
|
||
pub mod api; | ||
pub mod archive; | ||
|
||
pub use api::ArchiveApiServer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) Parity Technologies (UK) Ltd. | ||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 | ||
|
||
// This program is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// This program is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
||
use crate::chain_head::hex_string; | ||
|
||
use super::{archive::Archive, *}; | ||
|
||
use codec::{Decode, Encode}; | ||
use jsonrpsee::{types::EmptyServerParams as EmptyParams, RpcModule}; | ||
use sc_block_builder::BlockBuilderProvider; | ||
|
||
use sp_consensus::BlockOrigin; | ||
use sp_core::testing::TaskExecutor; | ||
use std::sync::Arc; | ||
use substrate_test_runtime_client::{ | ||
prelude::*, runtime, Backend, BlockBuilderExt, Client, ClientBlockImportExt, | ||
}; | ||
|
||
const CHAIN_GENESIS: [u8; 32] = [0; 32]; | ||
const INVALID_HASH: [u8; 32] = [1; 32]; | ||
|
||
type Header = substrate_test_runtime_client::runtime::Header; | ||
type Block = substrate_test_runtime_client::runtime::Block; | ||
|
||
fn setup_api() -> (Arc<Client<Backend>>, RpcModule<Archive<Backend, Block, Client<Backend>>>) { | ||
let builder = TestClientBuilder::new(); | ||
let backend = builder.backend(); | ||
let client = Arc::new(builder.build()); | ||
|
||
let api = | ||
Archive::new(client.clone(), backend, Arc::new(TaskExecutor::default()), CHAIN_GENESIS) | ||
.into_rpc(); | ||
|
||
(client, api) | ||
} | ||
|
||
#[tokio::test] | ||
async fn archive_genesis() { | ||
let (_client, api) = setup_api(); | ||
|
||
let genesis: String = | ||
api.call("archive_unstable_genesisHash", EmptyParams::new()).await.unwrap(); | ||
assert_eq!(genesis, hex_string(&CHAIN_GENESIS)); | ||
} | ||
|
||
#[tokio::test] | ||
async fn archive_body() { | ||
let (mut client, api) = setup_api(); | ||
|
||
// Invalid block hash. | ||
let invalid_hash = hex_string(&INVALID_HASH); | ||
let res: Option<Vec<String>> = api.call("archive_unstable_body", [invalid_hash]).await.unwrap(); | ||
assert!(res.is_none()); | ||
|
||
// Import a new block with an extrinsic. | ||
let mut builder = client.new_block(Default::default()).unwrap(); | ||
builder | ||
.push_transfer(runtime::Transfer { | ||
from: AccountKeyring::Alice.into(), | ||
to: AccountKeyring::Ferdie.into(), | ||
amount: 42, | ||
nonce: 0, | ||
}) | ||
.unwrap(); | ||
let block = builder.build().unwrap().block; | ||
let block_hash = format!("{:?}", block.header.hash()); | ||
client.import(BlockOrigin::Own, block.clone()).await.unwrap(); | ||
|
||
let expected_tx = hex_string(&block.extrinsics[0].encode()); | ||
|
||
let body: Vec<String> = api.call("archive_unstable_body", [block_hash]).await.unwrap(); | ||
assert_eq!(vec![expected_tx], body); | ||
} | ||
|
||
#[tokio::test] | ||
async fn archive_header() { | ||
let (mut client, api) = setup_api(); | ||
|
||
// Invalid block hash. | ||
let invalid_hash = hex_string(&INVALID_HASH); | ||
let res: Option<String> = api.call("archive_unstable_header", [invalid_hash]).await.unwrap(); | ||
assert!(res.is_none()); | ||
|
||
// Import a new block with an extrinsic. | ||
let mut builder = client.new_block(Default::default()).unwrap(); | ||
builder | ||
.push_transfer(runtime::Transfer { | ||
from: AccountKeyring::Alice.into(), | ||
to: AccountKeyring::Ferdie.into(), | ||
amount: 42, | ||
nonce: 0, | ||
}) | ||
.unwrap(); | ||
let block = builder.build().unwrap().block; | ||
let block_hash = format!("{:?}", block.header.hash()); | ||
client.import(BlockOrigin::Own, block.clone()).await.unwrap(); | ||
|
||
let header: String = api.call("archive_unstable_header", [block_hash]).await.unwrap(); | ||
let bytes = array_bytes::hex2bytes(&header).unwrap(); | ||
let header: Header = Decode::decode(&mut &bytes[..]).unwrap(); | ||
assert_eq!(header, block.header); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I raised paritytech/json-rpc-interface-spec#101 since I'd have thought we can remove this one :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the conclusion there is to keep it still :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, thanks for raising this. From my perspective, I forgot about the other discussions which removed similar
genesis
functions. And I would have opted to remove thearchive_genesis
.I could see the benefit of this API not necessarily being implemented by nodes (light or full), but also by third-parties which may have access only to the underlying DB.
We'll keep this for now and keep an eye on the
genesis
discussion