mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 19:17:58 +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>
243 lines
8.0 KiB
Rust
243 lines
8.0 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2021-2022 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 criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
|
|
|
|
use node_cli::service::{create_extrinsic, FullClient};
|
|
use node_runtime::{constants::currency::*, BalancesCall};
|
|
use sc_block_builder::{BlockBuilderProvider, BuiltBlock, RecordProof};
|
|
use sc_client_api::execution_extensions::ExecutionStrategies;
|
|
use sc_consensus::{
|
|
block_import::{BlockImportParams, ForkChoiceStrategy},
|
|
BlockImport, StateAction,
|
|
};
|
|
use sc_service::{
|
|
config::{
|
|
DatabaseSource, KeepBlocks, KeystoreConfig, NetworkConfiguration, OffchainWorkerConfig,
|
|
PruningMode, WasmExecutionMethod,
|
|
},
|
|
BasePath, Configuration, Role,
|
|
};
|
|
use sp_blockchain::{ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed};
|
|
use sp_consensus::BlockOrigin;
|
|
use sp_keyring::Sr25519Keyring;
|
|
use sp_runtime::{
|
|
generic::BlockId,
|
|
transaction_validity::{InvalidTransaction, TransactionValidityError},
|
|
AccountId32, MultiAddress, OpaqueExtrinsic,
|
|
};
|
|
use tokio::runtime::Handle;
|
|
|
|
fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
|
|
let base_path = BasePath::new_temp_dir()
|
|
.expect("getting the base path of a temporary path doesn't fail; qed");
|
|
let root = base_path.path().to_path_buf();
|
|
|
|
let network_config = NetworkConfiguration::new(
|
|
Sr25519Keyring::Alice.to_seed(),
|
|
"network/test/0.1",
|
|
Default::default(),
|
|
None,
|
|
);
|
|
|
|
let spec = Box::new(node_cli::chain_spec::development_config());
|
|
|
|
// NOTE: We enforce the use of the WASM runtime to benchmark block production using WASM.
|
|
let execution_strategy = sc_client_api::ExecutionStrategy::AlwaysWasm;
|
|
|
|
let config = Configuration {
|
|
impl_name: "BenchmarkImpl".into(),
|
|
impl_version: "1.0".into(),
|
|
// We don't use the authority role since that would start producing blocks
|
|
// in the background which would mess with our benchmark.
|
|
role: Role::Full,
|
|
tokio_handle,
|
|
transaction_pool: Default::default(),
|
|
network: network_config,
|
|
keystore: KeystoreConfig::InMemory,
|
|
keystore_remote: Default::default(),
|
|
database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 },
|
|
state_cache_size: 67108864,
|
|
state_cache_child_ratio: None,
|
|
state_pruning: Some(PruningMode::ArchiveAll),
|
|
keep_blocks: KeepBlocks::All,
|
|
chain_spec: spec,
|
|
wasm_method: WasmExecutionMethod::Compiled,
|
|
execution_strategies: ExecutionStrategies {
|
|
syncing: execution_strategy,
|
|
importing: execution_strategy,
|
|
block_construction: execution_strategy,
|
|
offchain_worker: execution_strategy,
|
|
other: execution_strategy,
|
|
},
|
|
rpc_http: None,
|
|
rpc_ws: None,
|
|
rpc_ipc: None,
|
|
rpc_ws_max_connections: None,
|
|
rpc_cors: None,
|
|
rpc_methods: Default::default(),
|
|
rpc_max_payload: None,
|
|
rpc_max_request_size: None,
|
|
rpc_max_response_size: None,
|
|
rpc_id_provider: None,
|
|
rpc_max_subs_per_conn: None,
|
|
ws_max_out_buffer_capacity: None,
|
|
prometheus_config: None,
|
|
telemetry_endpoints: None,
|
|
default_heap_pages: None,
|
|
offchain_worker: OffchainWorkerConfig { enabled: true, indexing_enabled: false },
|
|
force_authoring: false,
|
|
disable_grandpa: false,
|
|
dev_key_seed: Some(Sr25519Keyring::Alice.to_seed()),
|
|
tracing_targets: None,
|
|
tracing_receiver: Default::default(),
|
|
max_runtime_instances: 8,
|
|
runtime_cache_size: 2,
|
|
announce_block: true,
|
|
base_path: Some(base_path),
|
|
informant_output_format: Default::default(),
|
|
wasm_runtime_overrides: None,
|
|
};
|
|
|
|
node_cli::service::new_full_base(config, false, |_, _| ())
|
|
.expect("creating a full node doesn't fail")
|
|
}
|
|
|
|
fn extrinsic_set_time(now: u64) -> OpaqueExtrinsic {
|
|
node_runtime::UncheckedExtrinsic {
|
|
signature: None,
|
|
function: node_runtime::Call::Timestamp(pallet_timestamp::Call::set { now }),
|
|
}
|
|
.into()
|
|
}
|
|
|
|
fn import_block(
|
|
mut client: &FullClient,
|
|
built: BuiltBlock<
|
|
node_primitives::Block,
|
|
<FullClient as sp_api::CallApiAt<node_primitives::Block>>::StateBackend,
|
|
>,
|
|
) {
|
|
let mut params = BlockImportParams::new(BlockOrigin::File, built.block.header);
|
|
params.state_action =
|
|
StateAction::ApplyChanges(sc_consensus::StorageChanges::Changes(built.storage_changes));
|
|
params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
|
|
futures::executor::block_on(client.import_block(params, Default::default()))
|
|
.expect("importing a block doesn't fail");
|
|
}
|
|
|
|
fn prepare_benchmark(client: &FullClient) -> (usize, Vec<OpaqueExtrinsic>) {
|
|
const MINIMUM_PERIOD_FOR_BLOCKS: u64 = 1500;
|
|
|
|
let mut max_transfer_count = 0;
|
|
let mut extrinsics = Vec::new();
|
|
let mut block_builder = client.new_block(Default::default()).unwrap();
|
|
|
|
// Every block needs one timestamp extrinsic.
|
|
let extrinsic_set_time = extrinsic_set_time(1 + MINIMUM_PERIOD_FOR_BLOCKS);
|
|
block_builder.push(extrinsic_set_time.clone()).unwrap();
|
|
extrinsics.push(extrinsic_set_time);
|
|
|
|
// Creating those is surprisingly costly, so let's only do it once and later just `clone` them.
|
|
let src = Sr25519Keyring::Alice.pair();
|
|
let dst: MultiAddress<AccountId32, u32> = Sr25519Keyring::Bob.to_account_id().into();
|
|
|
|
// Add as many tranfer extrinsics as possible into a single block.
|
|
for nonce in 0.. {
|
|
let extrinsic: OpaqueExtrinsic = create_extrinsic(
|
|
client,
|
|
src.clone(),
|
|
BalancesCall::transfer { dest: dst.clone(), value: 1 * DOLLARS },
|
|
Some(nonce),
|
|
)
|
|
.into();
|
|
|
|
match block_builder.push(extrinsic.clone()) {
|
|
Ok(_) => {},
|
|
Err(ApplyExtrinsicFailed(Validity(TransactionValidityError::Invalid(
|
|
InvalidTransaction::ExhaustsResources,
|
|
)))) => break,
|
|
Err(error) => panic!("{}", error),
|
|
}
|
|
|
|
extrinsics.push(extrinsic);
|
|
max_transfer_count += 1;
|
|
}
|
|
|
|
(max_transfer_count, extrinsics)
|
|
}
|
|
|
|
fn block_production(c: &mut Criterion) {
|
|
sp_tracing::try_init_simple();
|
|
|
|
let runtime = tokio::runtime::Runtime::new().expect("creating tokio runtime doesn't fail; qed");
|
|
let tokio_handle = runtime.handle().clone();
|
|
|
|
let node = new_node(tokio_handle.clone());
|
|
let client = &*node.client;
|
|
|
|
// Buliding the very first block is around ~30x slower than any subsequent one,
|
|
// so let's make sure it's built and imported before we benchmark anything.
|
|
let mut block_builder = client.new_block(Default::default()).unwrap();
|
|
block_builder.push(extrinsic_set_time(1)).unwrap();
|
|
import_block(client, block_builder.build().unwrap());
|
|
|
|
let (max_transfer_count, extrinsics) = prepare_benchmark(&client);
|
|
log::info!("Maximum transfer count: {}", max_transfer_count);
|
|
|
|
let mut group = c.benchmark_group("Block production");
|
|
|
|
group.sample_size(10);
|
|
group.throughput(Throughput::Elements(max_transfer_count as u64));
|
|
|
|
let block_id = BlockId::Hash(client.chain_info().best_hash);
|
|
|
|
group.bench_function(format!("{} transfers (no proof)", max_transfer_count), |b| {
|
|
b.iter_batched(
|
|
|| extrinsics.clone(),
|
|
|extrinsics| {
|
|
let mut block_builder =
|
|
client.new_block_at(&block_id, Default::default(), RecordProof::No).unwrap();
|
|
for extrinsic in extrinsics {
|
|
block_builder.push(extrinsic).unwrap();
|
|
}
|
|
block_builder.build().unwrap()
|
|
},
|
|
BatchSize::SmallInput,
|
|
)
|
|
});
|
|
|
|
group.bench_function(format!("{} transfers (with proof)", max_transfer_count), |b| {
|
|
b.iter_batched(
|
|
|| extrinsics.clone(),
|
|
|extrinsics| {
|
|
let mut block_builder =
|
|
client.new_block_at(&block_id, Default::default(), RecordProof::Yes).unwrap();
|
|
for extrinsic in extrinsics {
|
|
block_builder.push(extrinsic).unwrap();
|
|
}
|
|
block_builder.build().unwrap()
|
|
},
|
|
BatchSize::SmallInput,
|
|
)
|
|
});
|
|
}
|
|
|
|
criterion_group!(benches, block_production);
|
|
criterion_main!(benches);
|