mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 21:37:56 +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>
277 lines
8.1 KiB
Rust
277 lines
8.1 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 futures::{future, StreamExt};
|
|
use node_cli::service::{create_extrinsic, fetch_nonce, FullClient, TransactionPool};
|
|
use node_primitives::AccountId;
|
|
use node_runtime::{constants::currency::*, BalancesCall, SudoCall};
|
|
use sc_client_api::execution_extensions::ExecutionStrategies;
|
|
use sc_service::{
|
|
config::{
|
|
DatabaseSource, KeepBlocks, KeystoreConfig, NetworkConfiguration, OffchainWorkerConfig,
|
|
PruningMode, TransactionPoolOptions, WasmExecutionMethod,
|
|
},
|
|
BasePath, Configuration, Role,
|
|
};
|
|
use sc_transaction_pool::PoolLimit;
|
|
use sc_transaction_pool_api::{TransactionPool as _, TransactionSource, TransactionStatus};
|
|
use sp_core::{crypto::Pair, sr25519};
|
|
use sp_keyring::Sr25519Keyring;
|
|
use sp_runtime::{generic::BlockId, OpaqueExtrinsic};
|
|
use tokio::runtime::Handle;
|
|
|
|
fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
|
|
let base_path = BasePath::new_temp_dir().expect("Creates base path");
|
|
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());
|
|
|
|
let config = Configuration {
|
|
impl_name: "BenchmarkImpl".into(),
|
|
impl_version: "1.0".into(),
|
|
role: Role::Authority,
|
|
tokio_handle,
|
|
transaction_pool: TransactionPoolOptions {
|
|
ready: PoolLimit { count: 100_000, total_bytes: 100 * 1024 * 1024 },
|
|
future: PoolLimit { count: 100_000, total_bytes: 100 * 1024 * 1024 },
|
|
reject_future_transactions: false,
|
|
},
|
|
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::Interpreted,
|
|
// NOTE: we enforce the use of the native runtime to make the errors more debuggable
|
|
execution_strategies: ExecutionStrategies {
|
|
syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
|
|
importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
|
|
block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
|
|
offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
|
|
other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
|
|
},
|
|
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("Creates node")
|
|
}
|
|
|
|
fn create_accounts(num: usize) -> Vec<sr25519::Pair> {
|
|
(0..num)
|
|
.map(|i| {
|
|
Pair::from_string(&format!("{}/{}", Sr25519Keyring::Alice.to_seed(), i), None)
|
|
.expect("Creates account pair")
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Create the extrinsics that will initialize the accounts from the sudo account (Alice).
|
|
///
|
|
/// `start_nonce` is the current nonce of Alice.
|
|
fn create_account_extrinsics(
|
|
client: &FullClient,
|
|
accounts: &[sr25519::Pair],
|
|
) -> Vec<OpaqueExtrinsic> {
|
|
let start_nonce = fetch_nonce(client, Sr25519Keyring::Alice.pair());
|
|
|
|
accounts
|
|
.iter()
|
|
.enumerate()
|
|
.flat_map(|(i, a)| {
|
|
vec![
|
|
// Reset the nonce by removing any funds
|
|
create_extrinsic(
|
|
client,
|
|
Sr25519Keyring::Alice.pair(),
|
|
SudoCall::sudo {
|
|
call: Box::new(
|
|
BalancesCall::set_balance {
|
|
who: AccountId::from(a.public()).into(),
|
|
new_free: 0,
|
|
new_reserved: 0,
|
|
}
|
|
.into(),
|
|
),
|
|
},
|
|
Some(start_nonce + (i as u32) * 2),
|
|
),
|
|
// Give back funds
|
|
create_extrinsic(
|
|
client,
|
|
Sr25519Keyring::Alice.pair(),
|
|
SudoCall::sudo {
|
|
call: Box::new(
|
|
BalancesCall::set_balance {
|
|
who: AccountId::from(a.public()).into(),
|
|
new_free: 1_000_000 * DOLLARS,
|
|
new_reserved: 0,
|
|
}
|
|
.into(),
|
|
),
|
|
},
|
|
Some(start_nonce + (i as u32) * 2 + 1),
|
|
),
|
|
]
|
|
})
|
|
.map(OpaqueExtrinsic::from)
|
|
.collect()
|
|
}
|
|
|
|
fn create_benchmark_extrinsics(
|
|
client: &FullClient,
|
|
accounts: &[sr25519::Pair],
|
|
extrinsics_per_account: usize,
|
|
) -> Vec<OpaqueExtrinsic> {
|
|
accounts
|
|
.iter()
|
|
.flat_map(|account| {
|
|
(0..extrinsics_per_account).map(move |nonce| {
|
|
create_extrinsic(
|
|
client,
|
|
account.clone(),
|
|
BalancesCall::transfer {
|
|
dest: Sr25519Keyring::Bob.to_account_id().into(),
|
|
value: 1 * DOLLARS,
|
|
},
|
|
Some(nonce as u32),
|
|
)
|
|
})
|
|
})
|
|
.map(OpaqueExtrinsic::from)
|
|
.collect()
|
|
}
|
|
|
|
async fn submit_tx_and_wait_for_inclusion(
|
|
tx_pool: &TransactionPool,
|
|
tx: OpaqueExtrinsic,
|
|
client: &FullClient,
|
|
wait_for_finalized: bool,
|
|
) {
|
|
let best_hash = client.chain_info().best_hash;
|
|
|
|
let mut watch = tx_pool
|
|
.submit_and_watch(&BlockId::Hash(best_hash), TransactionSource::External, tx.clone())
|
|
.await
|
|
.expect("Submits tx to pool")
|
|
.fuse();
|
|
|
|
loop {
|
|
match watch.select_next_some().await {
|
|
TransactionStatus::Finalized(_) => break,
|
|
TransactionStatus::InBlock(_) if !wait_for_finalized => break,
|
|
_ => {},
|
|
}
|
|
}
|
|
}
|
|
|
|
fn transaction_pool_benchmarks(c: &mut Criterion) {
|
|
sp_tracing::try_init_simple();
|
|
|
|
let runtime = tokio::runtime::Runtime::new().expect("Creates tokio runtime");
|
|
let tokio_handle = runtime.handle().clone();
|
|
|
|
let node = new_node(tokio_handle.clone());
|
|
|
|
let account_num = 10;
|
|
let extrinsics_per_account = 2000;
|
|
let accounts = create_accounts(account_num);
|
|
|
|
let mut group = c.benchmark_group("Transaction pool");
|
|
|
|
group.sample_size(10);
|
|
group.throughput(Throughput::Elements(account_num as u64 * extrinsics_per_account as u64));
|
|
|
|
let mut counter = 1;
|
|
group.bench_function(
|
|
format!("{} transfers from {} accounts", account_num * extrinsics_per_account, account_num),
|
|
move |b| {
|
|
b.iter_batched(
|
|
|| {
|
|
let prepare_extrinsics = create_account_extrinsics(&*node.client, &accounts);
|
|
|
|
runtime.block_on(future::join_all(prepare_extrinsics.into_iter().map(|tx| {
|
|
submit_tx_and_wait_for_inclusion(
|
|
&node.transaction_pool,
|
|
tx,
|
|
&*node.client,
|
|
true,
|
|
)
|
|
})));
|
|
|
|
create_benchmark_extrinsics(&*node.client, &accounts, extrinsics_per_account)
|
|
},
|
|
|extrinsics| {
|
|
runtime.block_on(future::join_all(extrinsics.into_iter().map(|tx| {
|
|
submit_tx_and_wait_for_inclusion(
|
|
&node.transaction_pool,
|
|
tx,
|
|
&*node.client,
|
|
false,
|
|
)
|
|
})));
|
|
|
|
println!("Finished {}", counter);
|
|
counter += 1;
|
|
},
|
|
BatchSize::SmallInput,
|
|
)
|
|
},
|
|
);
|
|
}
|
|
|
|
criterion_group!(benches, transaction_pool_benchmarks);
|
|
criterion_main!(benches);
|